Skip to content

Commit ea03e22

Browse files
authored
Fixes for molecule on platform role (#3)
* Fixes for molecule on platform role * Remove dw definition on molecule runtime role Signed-off-by: Jim Enright <jenright@cloudera.com>
1 parent 1e10d20 commit ea03e22

File tree

3 files changed

+8
-32
lines changed

3 files changed

+8
-32
lines changed

roles/platform/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ galaxy_info:
2020
addition to the CDP services, the role handles the deployment and management
2121
of the cloud provider artifacts required for CDP operations, e.g. roles, policies.
2222
company: Cloudera
23+
namespace: cloudera
2324
license: Apache-2.0
2425

2526
min_ansible_version: 2.10

roles/platform/tasks/setup_aws_authz.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
register: __aws_xaccount_policy
6767

6868
- name: Update AWS Cross Account Policy tags
69-
when: __plat_aws_policy_tags_list
69+
when: __plat_aws_policy_tags_list is defined
7070
ansible.builtin.command: >
7171
aws iam tag-policy
7272
--policy-arn {{ __aws_xaccount_policy.policy.arn }}
@@ -98,7 +98,7 @@
9898
delay: "{{ 10 | random(start=3, step=1) }}"
9999

100100
- name: Update AWS Cross Account Role tags
101-
when: __plat_aws_role_tags_list
101+
when: __plat_aws_role_tags_list is defined
102102
ansible.builtin.command: >
103103
aws iam tag-role
104104
--role-name {{ plat__aws_xaccount_role_name }}
@@ -132,7 +132,7 @@
132132
register: __aws_idbroker_assume_role_policy
133133

134134
- name: Update AWS Cross Account Policy tags
135-
when: __plat_aws_policy_tags_list
135+
when: __plat_aws_policy_tags_list is defined
136136
ansible.builtin.command: >
137137
aws iam tag-policy
138138
--policy-arn {{ __aws_idbroker_assume_role_policy.policy.arn }}
@@ -169,14 +169,14 @@
169169
register: __aws_cdp_data_access_policy_info
170170

171171
- name: Update CDP Data Access Policies tags
172-
when: __plat_aws_policy_tags_list
172+
when: __plat_aws_policy_tags_list is defined
173173
ansible.builtin.command: >
174174
aws iam tag-policy
175175
--policy-arn {{ __aws_cdp_data_policy_tags_item.policy.arn }}
176176
--tags {{ __plat_aws_policy_tags_list | join(' ') }}
177177
loop_control:
178178
loop_var: __aws_cdp_data_policy_tags_item
179-
label: "{{ __aws_cdp_data_policy_tags_item.policy.name }}"
179+
label: "{{ __aws_cdp_data_policy_tags_item.policy.policy_name }}"
180180
loop: "{{ __aws_cdp_data_access_policy_info.results }}"
181181
register: __aws_idbroker_assume_role_policy_tags
182182
failed_when: __aws_cdp_data_policy_tags_item.failed
@@ -219,7 +219,7 @@
219219
- "{{ plat__aws_bucket_access_policy_name }}"
220220

221221
- name: Update AWS Service Role tags
222-
when: __plat_aws_role_tags_list
222+
when: __plat_aws_role_tags_list is defined
223223
ansible.builtin.command: >
224224
aws iam tag-role
225225
--role-name {{ __aws_service_role_tags_item.iam_role.role_name }}
@@ -267,7 +267,7 @@
267267
- "{{ plat__aws_bucket_access_policy_name }}"
268268

269269
- name: Update AWS Data Access Role tags
270-
when: __plat_aws_role_tags_list
270+
when: __plat_aws_role_tags_list is defined
271271
ansible.builtin.command: >
272272
aws iam tag-role
273273
--role-name {{ __aws_data_access_role_tags_item.iam_role.role_name }}

roles/runtime/molecule/level0/molecule.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,6 @@ provisioner:
4747
region: ${FOUNDRY_AWS_REGION:-us-east-2}
4848
env:
4949
tunnel: no # L0 Networking
50-
dw:
51-
#force_delete: yes # Non-force delete is inconsistent until we can filter 'compactor' VWs
52-
tags:
53-
project: "${FOUNDRY_NAME_PREFIX:-r00}-CDW-testing"
54-
definitions:
55-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-empty
56-
- virtual_warehouses:
57-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-dbc-default
58-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-dbc-hive
59-
type: hive
60-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-dbc-impala
61-
type: impala
62-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-dbc-autoscale
63-
autoscaling:
64-
min_nodes: 0
65-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-named
66-
virtual_warehouses:
67-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-named-default
68-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-named-hive
69-
type: hive
70-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-named-impala
71-
type: impala
72-
- name: ${FOUNDRY_NAME_PREFIX:-r00}-named-autoscale
73-
autoscaling:
74-
min_nodes: 0
7550
verifier:
7651
name: ansible
7752
lint: |

0 commit comments

Comments
 (0)