diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:44:50 -0500 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:44:50 -0500 |
commit | 1a5319841b028d94294f683e407963742f340fe5 (patch) | |
tree | 08aa6aa833a3bf04cab1645b790bee1bc27ef6f3 /playbooks/gce/openshift-cluster/join_node.yml | |
parent | 265cd64555c9262f0896505caa6b036f6092dd0d (diff) | |
parent | da8165469a43dc3bf43b2024a76edcd04be0bb81 (diff) | |
download | openshift-1a5319841b028d94294f683e407963742f340fe5.tar.gz openshift-1a5319841b028d94294f683e407963742f340fe5.tar.bz2 openshift-1a5319841b028d94294f683e407963742f340fe5.tar.xz openshift-1a5319841b028d94294f683e407963742f340fe5.zip |
Merge pull request #958 from kwoodson/envfix
Fixing meta data tags env and environment
Diffstat (limited to 'playbooks/gce/openshift-cluster/join_node.yml')
-rw-r--r-- | playbooks/gce/openshift-cluster/join_node.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/playbooks/gce/openshift-cluster/join_node.yml b/playbooks/gce/openshift-cluster/join_node.yml index ab593b897..acf5e5110 100644 --- a/playbooks/gce/openshift-cluster/join_node.yml +++ b/playbooks/gce/openshift-cluster/join_node.yml @@ -4,13 +4,9 @@ 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 + - cluster_hosts.yml tasks: - name: Evaluate oo_hosts_to_update add_host: @@ -28,6 +24,7 @@ gather_facts: no vars_files: - vars.yml + - cluster_hosts.yml tasks: - name: Evaluate oo_nodes_to_config add_host: @@ -38,11 +35,11 @@ - name: Evaluate oo_first_master add_host: - name: "{{ g_master_hosts | first }}" + name: "{{ master_hosts | first }}" ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" groups: oo_first_master - when: g_master_hosts is defined and g_master_hosts|length > 0 + when: master_hosts is defined and master_hosts|length > 0 #- include: config.yml - include: ../../common/openshift-node/config.yml |