diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-27 13:41:16 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-27 13:41:16 -0300 |
| commit | d54665d0c0c1f7a3cec572c04f3ce769277c05e4 (patch) | |
| tree | 043628b7a804ad66019129129cc0186289d80a28 /playbooks/aws | |
| parent | 055921cd545c12733949f37c1af2c0a1296216ec (diff) | |
| parent | 5c7e1366ad8ae67ef23117d296a65a6ee81ccd29 (diff) | |
| download | openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.gz openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.bz2 openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.xz openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.zip | |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml index 236d84e74..e9ebc3e02 100644 --- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml @@ -147,6 +147,18 @@ tag_host-type_{{ host_type }}, tag_env-host-type_{{ env_host_type }}, tag_sub-host-type_{{ sub_host_type }}" +- set_fact: + node_label: + region: "{{ec2_region}}" + type: "{{sub_host_type}}" + when: host_type == "node" + +- set_fact: + node_label: + region: "{{ec2_region}}" + type: "{{host_type}}" + when: host_type != "node" + - name: Add new instances groups and variables add_host: hostname: "{{ item.0 }}" @@ -156,6 +168,7 @@ groups: "{{ instance_groups }}" ec2_private_ip_address: "{{ item.1.private_ip }}" ec2_ip_address: "{{ item.1.public_ip }}" + openshift_node_labels: "{{ node_label }}" with_together: - instances - ec2.instances |