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/aws/openshift-cluster/upgrades | |
| 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/aws/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 8 |
1 files changed, 4 insertions, 4 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 8cad51b5e..20cc97c8a 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 @@ -19,10 +19,10 @@ - include: ../../../../common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml vars: - g_etcd_group: "{{ 'tag_env-host-type_' ~ cluster_id ~ '-openshift-etcd' }}" - g_lb_group: "{{ 'tag_env-host-type_' ~ cluster_id ~ '-openshift-lb' }}" - g_masters_group: "{{ 'tag_env-host-type_' ~ cluster_id ~ '-openshift-master' }}" - g_nodes_group: "{{ tmp_nodes_group | default('') }}" + 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_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}" g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}" g_nodeonmaster: true |