summaryrefslogtreecommitdiffstats
path: root/roles/openshift_aws/tasks/iam_role.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-12 09:15:52 -0500
committerGitHub <noreply@github.com>2017-12-12 09:15:52 -0500
commit01ae634a0bf89fe840006f9139f8ffd20e09afc8 (patch)
treed53a7c03e4855885e124559018fff32adeaaf4ea /roles/openshift_aws/tasks/iam_role.yml
parent0b6fa3dcd40c2dd1f42fcceb52f82c2a28ed96e2 (diff)
parent35c1abb6050f2cd1f31396edd42618a2998bd546 (diff)
downloadopenshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.tar.gz
openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.tar.bz2
openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.tar.xz
openshift-01ae634a0bf89fe840006f9139f8ffd20e09afc8.zip
Merge pull request #6335 from kwoodson/node_groups_refactor
Node group management update.
Diffstat (limited to 'roles/openshift_aws/tasks/iam_role.yml')
-rw-r--r--roles/openshift_aws/tasks/iam_role.yml14
1 files changed, 6 insertions, 8 deletions
diff --git a/roles/openshift_aws/tasks/iam_role.yml b/roles/openshift_aws/tasks/iam_role.yml
index d9910d938..cf3bb28fb 100644
--- a/roles/openshift_aws/tasks/iam_role.yml
+++ b/roles/openshift_aws/tasks/iam_role.yml
@@ -13,11 +13,10 @@
#####
- name: Create an iam role
iam_role:
- name: "{{ item.value.iam_role }}"
+ name: "{{ l_node_group_config[openshift_aws_node_group.group].iam_role }}"
assume_role_policy_document: "{{ lookup('file','trustpolicy.json') }}"
state: "{{ openshift_aws_iam_role_state | default('present') }}"
- when: item.value.iam_role is defined
- with_dict: "{{ l_nodes_to_build }}"
+ when: l_node_group_config[openshift_aws_node_group.group].iam_role is defined
#####
# The second part of this task file is linking the role to a policy
@@ -28,9 +27,8 @@
- name: create an iam policy
iam_policy:
iam_type: role
- iam_name: "{{ item.value.iam_role }}"
- policy_json: "{{ item.value.policy_json }}"
- policy_name: "{{ item.value.policy_name }}"
+ iam_name: "{{ l_node_group_config[openshift_aws_node_group.group].iam_role }}"
+ policy_json: "{{ l_node_group_config[openshift_aws_node_group.group].policy_json }}"
+ policy_name: "{{ l_node_group_config[openshift_aws_node_group.group].policy_name }}"
state: "{{ openshift_aws_iam_role_state | default('present') }}"
- when: item.value.iam_role is defined
- with_dict: "{{ l_nodes_to_build }}"
+ when: "'iam_role' in l_node_group_config[openshift_aws_node_group.group]"