Skip to content

Commit 3be898e

Browse files
tmgstevensChaffelson
authored andcommitted
Update include_role statements to use the full role name within the Collection as a best practice (#10) (#11)
Fixes #9 Signed-off-by: Daniel Chaffelson Co-authored-by: Dan Chaffelson <[email protected]>
1 parent d7b9a81 commit 3be898e

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

roles/cloudera_manager/external_auth/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
- name: Set Cloudera Manager external auth configs
2323
include_role:
24-
name: cloudera_manager/config
24+
name: cloudera.cluster.cloudera_manager.config
2525
vars:
2626
api_config_keys_uppercase: True
2727
api_configs: "{{ lookup('template', 'external_auth_configs.j2') | from_yaml }}"

roles/config/cluster/kts/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
- name: Retrieve repository metadata
1818
include_role:
19-
name: deployment/repometa
19+
name: cloudera.cluster.deployment.repometa
2020
vars:
2121
repositories: "{{ cluster.repositories | default({}) }}"
2222

roles/deployment/cluster/tasks/create_base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
- name: Generate complete base cluster configs
1818
include_role:
19-
name: config/cluster/base
19+
name: cloudera.cluster.config.cluster.base
2020

2121
- name: Create databases and users
2222
include_role:
23-
name: deployment/databases
23+
name: cloudera.cluster.deployment.databases
2424
vars:
2525
services: "{{ cluster.services | default({}) }}"
2626

roles/deployment/cluster/tasks/create_kts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
- name: Generate complete kts cluster configs
1818
include_role:
19-
name: config/cluster/kts
19+
name: cloudera.cluster.config.cluster.kts
2020

2121
- name: Generate cluster template file
2222
template:

roles/deployment/cluster/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
- name: Apply "all hosts" configs
2222
include_role:
23-
name: cloudera_manager/config
23+
name: cloudera.cluster.cloudera_manager.config
2424
vars:
2525
api_config_keys_uppercase: False
2626
api_config_endpoint: cm/allHosts/config

roles/deployment/services/kms/tasks/create_kms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
- name: Generate KMS configs
7777
include_role:
78-
name: config/services/kms
78+
name: cloudera.cluster.config.services.kms
7979

8080
- name: Create KMS service
8181
cloudera.cluster.cm_api:

roles/teardown/tasks/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
- name: Remove Clusters from Cloudera Manager (compute)
7979
include_role:
80-
name: operations/delete_cluster
80+
name: cloudera.cluster.operations.delete_cluster
8181
vars:
8282
stop_cluster_before_delete: true
8383
cluster: "{{ default_cluster_compute | combine(_cluster) }}"
@@ -95,7 +95,7 @@
9595

9696
- name: Remove Clusters from Cloudera Manager (base)
9797
include_role:
98-
name: operations/delete_cluster
98+
name: cloudera.cluster.operations.delete_cluster
9999
vars:
100100
stop_cluster_before_delete: true
101101
cluster: "{{ default_cluster_base | combine(_cluster) }}"
@@ -113,7 +113,7 @@
113113

114114
- name: Remove Clusters from Cloudera Manager (kts)
115115
include_role:
116-
name: operations/delete_cluster
116+
name: cloudera.cluster.operations.delete_cluster
117117
vars:
118118
stop_cluster_before_delete: true
119119
cluster: "{{ default_cluster_kts | combine(_cluster) }}"
@@ -132,7 +132,7 @@
132132
# delete the cms from cm if we are not tearing cm down
133133
- name: Remove CMS from Cloudera Manager
134134
import_role:
135-
name: operations/delete_cms
135+
name: cloudera.cluster.operations.delete_cms
136136
vars:
137137
stop_cms_before_delete: true
138138
run_once: true

roles/teardown/tasks/teardown_cdsw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
- name: Generate merged configs (base)
1818
include_role:
19-
name: config/cluster/base
19+
name: cloudera.cluster.config.cluster.base
2020

2121
- name: Stop the CDSW node
2222
shell: /opt/cloudera/parcels/CDSW/scripts/cdsw-stop-node.sh

roles/teardown/tasks/teardown_cluster.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
- name: Generate merged configs (base, compute)
1818
include_role:
19-
name: config/cluster/base
19+
name: cloudera.cluster.config.cluster.base
2020
when: cluster.type | default('base') in ['base', 'compute']
2121

2222
- name: Generate merged configs (kts)
2323
include_role:
24-
name: config/cluster/kts
24+
name: cloudera.cluster.config.cluster.kts
2525
when: cluster.type | default('base') == 'kts'
2626

2727
- name: Remove cluster service directories (base, compute)

roles/teardown/tasks/teardown_cms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
- name: Generate merged configs
1818
include_role:
19-
name: config/services/mgmt
19+
name: cloudera.cluster.config.services.mgmt
2020

2121
- name: Delete service database
2222
include_tasks: teardown_database.yml

0 commit comments

Comments
 (0)