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/defaults | |
| 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/defaults')
| -rw-r--r-- | roles/openshift_aws/defaults/main.yml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml index 74e5d1dde..71de24339 100644 --- a/roles/openshift_aws/defaults/main.yml +++ b/roles/openshift_aws/defaults/main.yml @@ -122,12 +122,25 @@ openshift_aws_ami_map: openshift_aws_master_group: - name: "{{ openshift_aws_clusterid }} master group" group: master + tags: + host-type: master + sub-host-type: default + runtime: docker openshift_aws_node_groups: - name: "{{ openshift_aws_clusterid }} compute group" group: compute + tags: + host-type: node + sub-host-type: compute + runtime: docker + - name: "{{ openshift_aws_clusterid }} infra group" group: infra + tags: + host-type: node + sub-host-type: infra + runtime: docker openshift_aws_created_asgs: [] openshift_aws_current_asgs: [] @@ -144,10 +157,6 @@ openshift_aws_master_group_config: min_size: 3 max_size: 3 desired_size: 3 - tags: - host-type: master - sub-host-type: default - runtime: docker wait_for_instances: True termination_policy: "{{ openshift_aws_node_group_termination_policy }}" replace_all_instances: "{{ openshift_aws_node_group_replace_all_instances }}" @@ -167,10 +176,6 @@ openshift_aws_node_group_config: min_size: 3 max_size: 100 desired_size: 3 - tags: - host-type: node - sub-host-type: compute - runtime: docker termination_policy: "{{ openshift_aws_node_group_termination_policy }}" replace_all_instances: "{{ openshift_aws_node_group_replace_all_instances }}" iam_role: "{{ openshift_aws_iam_role_name }}" @@ -186,10 +191,6 @@ openshift_aws_node_group_config: min_size: 2 max_size: 20 desired_size: 2 - tags: - host-type: node - sub-host-type: infra - runtime: docker termination_policy: "{{ openshift_aws_node_group_termination_policy }}" replace_all_instances: "{{ openshift_aws_node_group_replace_all_instances }}" iam_role: "{{ openshift_aws_iam_role_name }}" |