summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-30 17:33:03 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-12-11 12:30:39 -0500
commit7c945d07d2a61e7334a10388d37ac28f1bc58ce1 (patch)
treed6a1c77f875ed11634aef0f79f476c2a5c7fa37c /playbooks/aws/openshift-cluster/tasks/launch_instances.yml
parent5ad87a4592167142ec23058385b9bb96b594a12b (diff)
downloadopenshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.gz
openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.bz2
openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.xz
openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.zip
Updating env-host-type to host patterns
Diffstat (limited to 'playbooks/aws/openshift-cluster/tasks/launch_instances.yml')
-rw-r--r--playbooks/aws/openshift-cluster/tasks/launch_instances.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 99f0577fc..1fbd71a75 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -3,7 +3,6 @@
created_by: "{{ lookup('env', 'LOGNAME')|default(cluster, true) }}"
docker_vol_ephemeral: "{{ lookup('env', 'os_docker_vol_ephemeral') | default(false, true) }}"
env: "{{ cluster }}"
- env_host_type: "{{ cluster }}-openshift-{{ type }}"
host_type: "{{ type }}"
sub_host_type: "{{ g_sub_host_type }}"
@@ -124,10 +123,8 @@
wait: yes
instance_tags:
created-by: "{{ created_by }}"
- environment: "{{ env }}"
env: "{{ env }}"
host-type: "{{ host_type }}"
- env-host-type: "{{ env_host_type }}"
sub-host-type: "{{ sub_host_type }}"
volumes: "{{ volumes }}"
register: ec2
@@ -142,9 +139,7 @@
Name: "{{ item.0 }}"
- set_fact:
- instance_groups: "tag_created-by_{{ created_by }}, tag_env_{{ env }},
- tag_host-type_{{ host_type }}, tag_env-host-type_{{ env_host_type }},
- tag_sub-host-type_{{ sub_host_type }}"
+ instance_groups: "tag_created-by_{{ created_by }}, tag_env_{{ env }}, tag_host-type_{{ host_type }}, tag_sub-host-type_{{ sub_host_type }}"
- set_fact:
node_label: