diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-12-18 14:01:34 -0500 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:00:20 -0500 |
commit | 67b3fff8257072095ebdebfdfe5c429efea3a8d8 (patch) | |
tree | 8a25b519e2171a7abd145ba19cf97b638cbcedb5 /playbooks/byo/openshift-cluster/upgrades | |
parent | a21189c1f0611bff6935364c8c255a88060d882d (diff) | |
download | openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.gz openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.bz2 openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.xz openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.zip |
Cleanup and fixes for cluster_id change
- Move debug_level into vars.yml and byo inventory
- change variables in cluster_hosts.yml to be g_* and update playbooks to use
those values directly instead of setting them indirectly
- added a new g_all_hosts entry in cluster_hosts to use in the update playbook
instead of unioning all host types within the playbook
- added a cluster_hosts.yml for the byo playbook
Diffstat (limited to 'playbooks/byo/openshift-cluster/upgrades')
-rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml | 2 | ||||
-rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml index c3358eb4b..58c04d41d 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml @@ -1,5 +1,7 @@ --- - include: ../../../../common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml + vars_files: + - ../../../../byo/openshift-cluster/cluster_hosts.yml vars: g_etcd_hosts: "{{ groups.etcd | default([]) }}" g_master_hosts: "{{ groups.masters | default([]) }}" diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 960c00087..2f9e8dc7a 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -1,5 +1,7 @@ --- - include: ../../../../common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml + vars_files: + - ../../../../byo/openshift-cluster/cluster_hosts.yml vars: g_etcd_hosts: "{{ groups.etcd | default([]) }}" g_master_hosts: "{{ groups.masters | default([]) }}" |