From 4a42814abf452514266d934a070f333c65c03a56 Mon Sep 17 00:00:00 2001 From: Chris Edillon Date: Mon, 22 Apr 2024 17:02:54 -0400 Subject: [PATCH 1/2] switch to infra.controller_configuration.dispatch - instead of looping through individual controller configuration roles, call the dispatch role. note that setup_demo.yml calls the dispatch role twice, but using task vars for the first call should prevent the second call from reusing existing variable values. closes #81 - no longer uses redhat_cop.controller_configuration collection, closes #118 --- cloud/setup.yml | 9 --------- linux/setup.yml | 6 ------ multi_select_setup.yml | 2 +- network/setup.yml | 9 --------- openshift/setup.yml | 4 ---- satellite/setup.yml | 8 -------- setup_demo.yml | 12 ++---------- windows/setup.yml | 4 ---- 8 files changed, 3 insertions(+), 51 deletions(-) diff --git a/cloud/setup.yml b/cloud/setup.yml index 1a4ced642..4e527c141 100644 --- a/cloud/setup.yml +++ b/cloud/setup.yml @@ -1,15 +1,6 @@ --- user_message: -controller_components: - - execution_environments - - projects - - credentials - - inventory_sources - - groups - - job_templates - - workflow_job_templates - controller_execution_environments: - name: Cloud Services Execution Environment image: quay.io/scottharwell/cloud-ee:latest diff --git a/linux/setup.yml b/linux/setup.yml index a950c5323..3208c55d0 100644 --- a/linux/setup.yml +++ b/linux/setup.yml @@ -3,12 +3,6 @@ user_message: - Update the 'activation_key' and 'org_id' extra variables for 'LINUX / Register with Insights'. https://access.redhat.com/management/activation_keys - Update Credential for Insights Inventory with Red Hat account. - Add variables for system_roles. https://console.redhat.com/ansible/automation-hub/repo/published/redhat/rhel_system_roles -controller_components: - - projects - - credential_types - - credentials - - inventory_sources - - job_templates controller_credential_types: - name: Insights Collection diff --git a/multi_select_setup.yml b/multi_select_setup.yml index 8958b100f..8b8931811 100644 --- a/multi_select_setup.yml +++ b/multi_select_setup.yml @@ -15,4 +15,4 @@ - name: Default Components ansible.builtin.include_role: - name: "redhat_cop.controller_configuration.job_launch" + name: "infra.controller_configuration.job_launch" diff --git a/network/setup.yml b/network/setup.yml index 24501e444..aa6c90cbf 100644 --- a/network/setup.yml +++ b/network/setup.yml @@ -1,15 +1,6 @@ --- user_message: -controller_components: - - execution_environments - - projects - - inventories - - hosts - - inventory_sources - - inventory_source_update - - job_templates - controller_execution_environments: - name: Networking Execution Environment image: quay.io/nleiva/ee-network-image diff --git a/openshift/setup.yml b/openshift/setup.yml index d5db457a6..a505b522a 100644 --- a/openshift/setup.yml +++ b/openshift/setup.yml @@ -1,8 +1,4 @@ --- -controller_components: - - credentials - - job_templates - controller_credentials: - name: OpenShift Credential organization: Default diff --git a/satellite/setup.yml b/satellite/setup.yml index 76507a621..193ff6b62 100644 --- a/satellite/setup.yml +++ b/satellite/setup.yml @@ -1,14 +1,6 @@ --- user_message: -controller_components: - - credential_types - - credentials - - inventory_sources - - job_templates - - job_launch - - workflow_job_templates - controller_credential_types: - name: Satellite Collection kind: cloud diff --git a/setup_demo.yml b/setup_demo.yml index 485263474..5c1cc51e1 100644 --- a/setup_demo.yml +++ b/setup_demo.yml @@ -6,13 +6,8 @@ tasks: - name: Default Components ansible.builtin.include_role: - name: "redhat_cop.controller_configuration.{{ item }}" - loop: "{{ controller_components }}" + name: infra.controller_configuration.dispatch vars: # noqa var-naming[no-role-prefix] - controller_components: - - notification_templates - - job_templates - - settings controller_execution_environments: - name: product-demos image: http://quay.io/acme_corp/product-demos-ee:latest @@ -59,10 +54,7 @@ - name: Demo Components ansible.builtin.include_role: - name: "redhat_cop.controller_configuration.{{ item }}" - loop: "{{ controller_components }}" - when: - - controller_components | d("") | length > 0 + name: "infra.controller_configuration.dispatch" - name: Log Demo ansible.builtin.uri: diff --git a/windows/setup.yml b/windows/setup.yml index 977b93f0e..19f84d0c8 100644 --- a/windows/setup.yml +++ b/windows/setup.yml @@ -2,10 +2,6 @@ user_message: | '' -controller_components: - - projects - - job_templates - controller_projects: - name: Fact Scan organization: Default From 42eedaa88b953e56f2926bc7a0522e68ff5d3aec Mon Sep 17 00:00:00 2001 From: Chris Edillon Date: Tue, 23 Apr 2024 15:53:20 -0400 Subject: [PATCH 2/2] updated product-demos EE image definition --- setup_demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_demo.yml b/setup_demo.yml index 5c1cc51e1..a1dfc4292 100644 --- a/setup_demo.yml +++ b/setup_demo.yml @@ -10,7 +10,7 @@ vars: # noqa var-naming[no-role-prefix] controller_execution_environments: - name: product-demos - image: http://quay.io/acme_corp/product-demos-ee:latest + image: quay.io/acme_corp/product-demos-ee:latest controller_organizations: - name: Default default_environment: product-demos