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/join_node.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/join_node.yml')
-rw-r--r-- | playbooks/gce/openshift-cluster/join_node.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/playbooks/gce/openshift-cluster/join_node.yml b/playbooks/gce/openshift-cluster/join_node.yml index 386628e8c..ab593b897 100644 --- a/playbooks/gce/openshift-cluster/join_node.yml +++ b/playbooks/gce/openshift-cluster/join_node.yml @@ -4,6 +4,11 @@ connection: local become: no gather_facts: no + vars: + g_etcd_hosts: "{{ (groups['tag_host-type-etcd']|default([])) | intersect(groups['tag_env-' ~ cluster_id]) }}" + g_lb_hosts: "{{ (groups['tag_host-type-lb']|default([])) | intersect(groups['tag_env-' ~ cluster_id]) }}" + g_master_hosts: "{{ (groups['tag_host-type-master']|default([])) | intersect(groups['tag_env-' ~ cluster_id]) }}" + g_node_hosts: "{{ (groups['tag_host-type-node']|default([])) | intersect((groups['tag_env-' ~ cluster_id]|default([]))) }}" vars_files: - vars.yml tasks: @@ -33,11 +38,11 @@ - name: Evaluate oo_first_master add_host: - name: "{{ groups['tag_env-host-type-' ~ cluster_id ~ '-openshift-master'][0] }}" + name: "{{ g_master_hosts | first }}" ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" groups: oo_first_master - when: "'tag_env-host-type-{{ cluster_id }}-openshift-master' in groups" + when: g_master_hosts is defined and g_master_hosts|length > 0 #- include: config.yml - include: ../../common/openshift-node/config.yml |