summaryrefslogtreecommitdiffstats
path: root/playbooks/init
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-10 17:05:42 -0500
committerGitHub <noreply@github.com>2018-01-10 17:05:42 -0500
commit21c6da3a052e8f0df509458bbaa6abc659874f0e (patch)
tree1e91dc2d15c02050f2f49c3f0e3d48b2f6069e4d /playbooks/init
parent3041060af052648c772a34e4e9cf25f0ce14bf77 (diff)
parent870b4b66cb8cd8a1accd3d1964f2f40a719403ed (diff)
downloadopenshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.tar.gz
openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.tar.bz2
openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.tar.xz
openshift-21c6da3a052e8f0df509458bbaa6abc659874f0e.zip
Merge pull request #6683 from mgugino-upstream-stage/fix-pkg_version
Add defaults for openshift_pkg_version
Diffstat (limited to 'playbooks/init')
-rw-r--r--playbooks/init/version.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/init/version.yml b/playbooks/init/version.yml
index 8d1d61fde..962ee7220 100644
--- a/playbooks/init/version.yml
+++ b/playbooks/init/version.yml
@@ -6,7 +6,7 @@
- include_role:
name: openshift_version
tasks_from: first_master.yml
- - debug: msg="openshift_pkg_version set to {{ openshift_pkg_version }}"
+ - debug: msg="openshift_pkg_version set to {{ openshift_pkg_version | default('') }}"
# 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
@@ -16,7 +16,7 @@
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_pkg_version: "{{ hostvars[groups.oo_first_master.0].openshift_pkg_version | default('') }}"
l_first_master_openshift_image_tag: "{{ hostvars[groups.oo_first_master.0].openshift_image_tag}}"
tasks:
- set_fact: