Skip to content

Commit 4a42814

Browse files
committed
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
1 parent 9cd4989 commit 4a42814

File tree

8 files changed

+3
-51
lines changed

8 files changed

+3
-51
lines changed

cloud/setup.yml

-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
---
22
user_message:
33

4-
controller_components:
5-
- execution_environments
6-
- projects
7-
- credentials
8-
- inventory_sources
9-
- groups
10-
- job_templates
11-
- workflow_job_templates
12-
134
controller_execution_environments:
145
- name: Cloud Services Execution Environment
156
image: quay.io/scottharwell/cloud-ee:latest

linux/setup.yml

-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ user_message:
33
- Update the 'activation_key' and 'org_id' extra variables for 'LINUX / Register with Insights'. https://access.redhat.com/management/activation_keys
44
- Update Credential for Insights Inventory with Red Hat account.
55
- Add variables for system_roles. https://console.redhat.com/ansible/automation-hub/repo/published/redhat/rhel_system_roles
6-
controller_components:
7-
- projects
8-
- credential_types
9-
- credentials
10-
- inventory_sources
11-
- job_templates
126

137
controller_credential_types:
148
- name: Insights Collection

multi_select_setup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
- name: Default Components
1717
ansible.builtin.include_role:
18-
name: "redhat_cop.controller_configuration.job_launch"
18+
name: "infra.controller_configuration.job_launch"

network/setup.yml

-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
---
22
user_message:
33

4-
controller_components:
5-
- execution_environments
6-
- projects
7-
- inventories
8-
- hosts
9-
- inventory_sources
10-
- inventory_source_update
11-
- job_templates
12-
134
controller_execution_environments:
145
- name: Networking Execution Environment
156
image: quay.io/nleiva/ee-network-image

openshift/setup.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
---
2-
controller_components:
3-
- credentials
4-
- job_templates
5-
62
controller_credentials:
73
- name: OpenShift Credential
84
organization: Default

satellite/setup.yml

-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
---
22
user_message:
33

4-
controller_components:
5-
- credential_types
6-
- credentials
7-
- inventory_sources
8-
- job_templates
9-
- job_launch
10-
- workflow_job_templates
11-
124
controller_credential_types:
135
- name: Satellite Collection
146
kind: cloud

setup_demo.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66
tasks:
77
- name: Default Components
88
ansible.builtin.include_role:
9-
name: "redhat_cop.controller_configuration.{{ item }}"
10-
loop: "{{ controller_components }}"
9+
name: infra.controller_configuration.dispatch
1110
vars: # noqa var-naming[no-role-prefix]
12-
controller_components:
13-
- notification_templates
14-
- job_templates
15-
- settings
1611
controller_execution_environments:
1712
- name: product-demos
1813
image: http://quay.io/acme_corp/product-demos-ee:latest
@@ -59,10 +54,7 @@
5954

6055
- name: Demo Components
6156
ansible.builtin.include_role:
62-
name: "redhat_cop.controller_configuration.{{ item }}"
63-
loop: "{{ controller_components }}"
64-
when:
65-
- controller_components | d("") | length > 0
57+
name: "infra.controller_configuration.dispatch"
6658

6759
- name: Log Demo
6860
ansible.builtin.uri:

windows/setup.yml

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
user_message: |
33
''
44
5-
controller_components:
6-
- projects
7-
- job_templates
8-
95
controller_projects:
106
- name: Fact Scan
117
organization: Default

0 commit comments

Comments
 (0)