summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-23 11:53:27 -0500
committerKenny Woodson <kwoodson@redhat.com>2016-01-04 09:58:39 -0500
commita21189c1f0611bff6935364c8c255a88060d882d (patch)
treea69d854a9a2ce78c6917583ff5877cf4199c8a1a /playbooks/aws/openshift-cluster/upgrades
parentf1951b2ca60536e81c9ff26a30b1cfbaf5ca12e9 (diff)
downloadopenshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.gz
openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.bz2
openshift-a21189c1f0611bff6935364c8c255a88060d882d.tar.xz
openshift-a21189c1f0611bff6935364c8c255a88060d882d.zip
Removing environment and env tags.
Diffstat (limited to 'playbooks/aws/openshift-cluster/upgrades')
-rw-r--r--playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml17
1 files changed, 9 insertions, 8 deletions
diff --git a/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index 20cc97c8a..1534d9742 100644
--- a/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -7,22 +7,23 @@
vars_files:
- ../../vars.yml
- "../../vars.{{ deployment_type }}.{{ cluster_id }}.yml"
+ - ../../cluster_hosts.yml
tasks:
- set_fact:
g_ssh_user_tmp: "{{ deployment_vars[deployment_type].ssh_user }}"
g_sudo_tmp: "{{ deployment_vars[deployment_type].sudo }}"
-
- - set_fact:
- tmp_nodes_group: "{{ 'tag_env-host-type_' ~ cluster_id ~ '-openshift-node' }}"
- when: deployment_type != 'online'
+ g_etcd_hosts: "{{ etcd_hosts }}"
+ g_master_hosts: "{{ master_hosts }}"
+ g_node_hosts: "{{ node_hosts }}"
+ g_lb_hosts: "{{ lb_hosts }}"
- include: ../../../../common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
vars:
- g_etcd_hosts: "{{ (groups['tag_host-type_etcd']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}"
- g_lb_hosts: "{{ (groups['tag_host-type_lb']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}"
- g_master_hosts: "{{ (groups['tag_host-type_master']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}"
- g_node_hosts: "{{ (groups['tag_host-type_node']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}"
+ g_etcd_hosts: "{{ hostvars.localhost.g_etcd_hosts }}"
+ g_master_hosts: "{{ hostvars.localhost.g_master_hosts }}"
+ g_node_hosts: "{{ hostvars.localhost.g_node_hosts }}"
+ g_lb_hosts: "{{ hostvars.localhost.g_lb_hosts }}"
g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
g_nodeonmaster: true