diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-19 15:35:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 15:35:49 -0800 |
| commit | 33450f75b336744615c066a34d7391cc9996af18 (patch) | |
| tree | 12c7a90ce11fc1ca67eceff736ce5205eb0efc28 /roles/openshift_aws/tasks | |
| parent | 0fc45b607ee46762c4d890f6fd07647d5d188d66 (diff) | |
| parent | c3945d39c9264dfa6f393701122d009c7ef2f2a8 (diff) | |
| download | openshift-33450f75b336744615c066a34d7391cc9996af18.tar.gz openshift-33450f75b336744615c066a34d7391cc9996af18.tar.bz2 openshift-33450f75b336744615c066a34d7391cc9996af18.tar.xz openshift-33450f75b336744615c066a34d7391cc9996af18.zip | |
Merge pull request #6509 from abutcher/asg-tags
Automatic merge from submit-queue.
Move node group tags to openshift_aws_{master,node}_group.
Move node groups tags to `openshift_aws_{master,node}_group` variables as discussed below.
Diffstat (limited to 'roles/openshift_aws/tasks')
| -rw-r--r-- | roles/openshift_aws/tasks/build_node_group.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_aws/tasks/scale_group.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_aws/tasks/build_node_group.yml b/roles/openshift_aws/tasks/build_node_group.yml index 7fb617dd5..9485cc3ac 100644 --- a/roles/openshift_aws/tasks/build_node_group.yml +++ b/roles/openshift_aws/tasks/build_node_group.yml @@ -30,7 +30,7 @@ - name: query all asg's for this cluster ec2_asg_facts: region: "{{ openshift_aws_region }}" - tags: "{{ {'kubernetes.io/cluster/' ~ openshift_aws_clusterid: openshift_aws_clusterid} | combine(l_node_group_config[openshift_aws_node_group.group].tags) }}" + tags: "{{ {'kubernetes.io/cluster/' ~ openshift_aws_clusterid: openshift_aws_clusterid} | combine(openshift_aws_node_group.tags) }}" register: asgs - fail: diff --git a/roles/openshift_aws/tasks/scale_group.yml b/roles/openshift_aws/tasks/scale_group.yml index 3632f7ce9..6ce8c58ba 100644 --- a/roles/openshift_aws/tasks/scale_group.yml +++ b/roles/openshift_aws/tasks/scale_group.yml @@ -22,7 +22,7 @@ else (l_node_group_config[openshift_aws_node_group.group].replace_all_instances | default(omit)) }}" tags: - "{{ openshift_aws_node_group_config_tags - | combine(l_node_group_config[openshift_aws_node_group.group].tags) + | combine(openshift_aws_node_group.tags) | combine({'deployment_serial': l_deployment_serial, 'ami': openshift_aws_ami_map[openshift_aws_node_group.group] | default(openshift_aws_ami)}) }}" - name: append the asg name to the openshift_aws_created_asgs fact |