diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-01-09 11:45:23 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-01-09 12:02:02 -0500 |
| commit | a3e80f646abacc76267abf4df73bde870909aa11 (patch) | |
| tree | 048dbb7d3f4b0cd3a170a20cca36d438d13fdf92 /playbooks/init | |
| parent | 54a83bf2b898338c70aeb094c9a0b86b8df8e2d2 (diff) | |
| download | openshift-a3e80f646abacc76267abf4df73bde870909aa11.tar.gz openshift-a3e80f646abacc76267abf4df73bde870909aa11.tar.bz2 openshift-a3e80f646abacc76267abf4df73bde870909aa11.tar.xz openshift-a3e80f646abacc76267abf4df73bde870909aa11.zip | |
Limit host group scope on control-plane upgrades
This commit limits common init code to exclude
oo_nodes_to_config during upgrade_control_plane runs.
Diffstat (limited to 'playbooks/init')
| -rw-r--r-- | playbooks/init/facts.yml | 4 | ||||
| -rw-r--r-- | playbooks/init/version.yml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml index 094db845d..8e4206948 100644 --- a/playbooks/init/facts.yml +++ b/playbooks/init/facts.yml @@ -5,7 +5,9 @@ tasks: - name: Initialize host facts - hosts: oo_all_hosts + # l_upgrade_non_node_hosts is passed in via play during control-plane-only + # upgrades; otherwise oo_all_hosts is used. + hosts: "{{ l_upgrade_non_node_hosts | default('oo_all_hosts') }}" tasks: - name: load openshift_facts module import_role: diff --git a/playbooks/init/version.yml b/playbooks/init/version.yml index ae5470db1..8d1d61fde 100644 --- a/playbooks/init/version.yml +++ b/playbooks/init/version.yml @@ -12,8 +12,9 @@ # and we don't want to install wrong version of docker and have to downgrade # later. - name: Set openshift_version for etcd, node, and master hosts - hosts: oo_etcd_to_config:oo_nodes_to_config:oo_masters_to_config:!oo_first_master + hosts: "{{ l_openshift_version_set_hosts | default(l_default_version_set_hosts) }}" vars: + l_default_version_set_hosts: "oo_etcd_to_config:oo_nodes_to_config:oo_masters_to_config:!oo_first_master" l_first_master_openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift_version }}" l_first_master_openshift_pkg_version: "{{ hostvars[groups.oo_first_master.0].openshift_pkg_version }}" l_first_master_openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag}}" |