diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-31 13:39:16 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-31 13:39:16 -0300 |
| commit | a5a736f4042abca402f7648a830968c205163a34 (patch) | |
| tree | 3387e3941a6dc6610fc2643da33a09e87df34abd | |
| parent | 47c8c0b1df866b86b111e3e03b827011ec4c341c (diff) | |
| download | openshift-a5a736f4042abca402f7648a830968c205163a34.tar.gz openshift-a5a736f4042abca402f7648a830968c205163a34.tar.bz2 openshift-a5a736f4042abca402f7648a830968c205163a34.tar.xz openshift-a5a736f4042abca402f7648a830968c205163a34.zip | |
Stop requiring/using first master version fact and use openshift_version var instead.
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_version.yml | 9 |
1 files changed, 4 insertions, 5 deletions
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 |