summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-04 21:22:24 -0700
committerGitHub <noreply@github.com>2017-10-04 21:22:24 -0700
commit19344491989a2d51b85b9804080da3b30351b911 (patch)
tree217948ace5b35f6896f6dc6d3ee9e5933bdf8523
parentceac0382042f82efe1a8bf9e559d292fde3c215c (diff)
parent2c9760da2857245eee9df0700b7aba1b7c06270d (diff)
downloadopenshift-19344491989a2d51b85b9804080da3b30351b911.tar.gz
openshift-19344491989a2d51b85b9804080da3b30351b911.tar.bz2
openshift-19344491989a2d51b85b9804080da3b30351b911.tar.xz
openshift-19344491989a2d51b85b9804080da3b30351b911.zip
Merge pull request #5636 from mgugino-upstream-stage/limit-openshift-version-hosts
Automatic merge from submit-queue. Limit hosts that run openshift_version role Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
-rw-r--r--playbooks/common/openshift-cluster/initialize_openshift_version.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index 6100c36e1..e6400ea61 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -19,8 +19,8 @@
# NOTE: We set this even on etcd hosts as they may also later run as masters,
# and we don't want to install wrong version of docker and have to downgrade
# later.
-- name: Set openshift_version for all hosts
- hosts: oo_all_hosts:!oo_first_master
+- 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
vars:
openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift_version }}"
pre_tasks: