diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-23 11:53:27 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 09:58:39 -0500 |
| commit | a21189c1f0611bff6935364c8c255a88060d882d (patch) | |
| tree | a69d854a9a2ce78c6917583ff5877cf4199c8a1a /playbooks/gce/openshift-cluster/join_node.yml | |
| parent | f1951b2ca60536e81c9ff26a30b1cfbaf5ca12e9 (diff) | |
| download | openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.gz openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.bz2 openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.xz openshift-a21189c1f0611bff6935364c8c255a88060d882d.zip | |
Removing environment and env tags.
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 |