From a5a736f4042abca402f7648a830968c205163a34 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 31 May 2016 13:39:16 -0300 Subject: Stop requiring/using first master version fact and use openshift_version var instead. --- .../common/openshift-cluster/initialize_openshift_version.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 85ad52b22..75452f41d 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -5,7 +5,7 @@ roles: # Using the CLI role here to install the CLI tool/wrapper, and set the # openshift.common.version fact which other hosts can then reference. - - openshift_cli + - openshift_version pre_tasks: - debug: var=openshift.common.version - debug: var=openshift_version @@ -19,14 +19,13 @@ - name: Set openshift_version for all hosts hosts: oo_all_hosts tasks: - - debug: var=hostvars[groups.oo_first_master.0].openshift.common.version + - debug: var=hostvars[groups.oo_first_master.0].openshift_version - debug: var=openshift.common.version - debug: var=openshift_version - # TODO: Should we use the first master's "openshift_version" var instead of a fact? Could go to just openshift_docker role above, and skip CLI config this early. - set_fact: - openshift_version: "{{ openshift.common.version if openshift.common.version is defined else hostvars[groups.oo_first_master.0].openshift.common.version.split('-')[0] }}" + openshift_version: "{{ openshift.common.version if openshift.common.version is defined else hostvars[groups.oo_first_master.0].openshift_version }}" when: inventory_hostname != groups.oo_first_master.0 - - debug: var=hostvars[groups.oo_first_master.0].openshift.common.version + - debug: var=hostvars[groups.oo_first_master.0].openshift_version - debug: var=openshift.common.version - debug: var=openshift_version -- cgit v1.2.3