diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-12-14 09:08:56 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-12-14 09:08:56 -0500 |
| commit | e4ecb0ea7415e0db3957926e5c6a571c36e2ffd1 (patch) | |
| tree | a1b1bcc5970889d913193b324423bee1ee3c8dbb /playbooks/gce/openshift-cluster/service.yml | |
| parent | 40ce28e760021571504efe3b89a4034b98c64f4b (diff) | |
| parent | 7c945d07d2a61e7334a10388d37ac28f1bc58ce1 (diff) | |
| download | openshift-e4ecb0ea7415e0db3957926e5c6a571c36e2ffd1.tar.gz openshift-e4ecb0ea7415e0db3957926e5c6a571c36e2ffd1.tar.bz2 openshift-e4ecb0ea7415e0db3957926e5c6a571c36e2ffd1.tar.xz openshift-e4ecb0ea7415e0db3957926e5c6a571c36e2ffd1.zip | |
Merge pull request #1028 from kwoodson/remove_env_host_type
Removing env-host-type in preparation of env and environment changes.
Diffstat (limited to 'playbooks/gce/openshift-cluster/service.yml')
| -rw-r--r-- | playbooks/gce/openshift-cluster/service.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/playbooks/gce/openshift-cluster/service.yml b/playbooks/gce/openshift-cluster/service.yml index 4bf5c8131..337ba7e44 100644 --- a/playbooks/gce/openshift-cluster/service.yml +++ b/playbooks/gce/openshift-cluster/service.yml @@ -10,21 +10,19 @@ - fail: msg="cluster_id is required to be injected in this playbook" when: cluster_id is not defined - - set_fact: scratch_group=tag_env-host-type-{{ cluster_id }}-openshift-node - add_host: name: "{{ item }}" groups: g_service_nodes ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" - with_items: groups[scratch_group] | default([]) | difference(['localhost']) | difference(groups.status_terminated) + with_items: "{{ g_node_hosts | default([]) | difference(['localhost']) | difference(groups.status_terminated) }}" - - set_fact: scratch_group=tag_env-host-type-{{ cluster_id }}-openshift-master - add_host: name: "{{ item }}" groups: g_service_masters ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" - with_items: groups[scratch_group] | default([]) | difference(['localhost']) | difference(groups.status_terminated) + with_items: "{{ g_master_hosts | default([]) | difference(['localhost']) | difference(groups.status_terminated) }}" - include: ../../common/openshift-node/service.yml - include: ../../common/openshift-master/service.yml |