diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-07-15 17:12:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-15 17:12:43 -0400 |
commit | 36a875d58fd6832851fad11dccd1245758950523 (patch) | |
tree | e547e9ccdc464c2160e0a893f3e751f10ecbf702 /roles | |
parent | 56f5b7369dab6202893ebe57fdadaaaa5e99e3b9 (diff) | |
parent | d994d0789a4b47ae619f404a6e36e947cba2e4e1 (diff) | |
download | openshift-36a875d58fd6832851fad11dccd1245758950523.tar.gz openshift-36a875d58fd6832851fad11dccd1245758950523.tar.bz2 openshift-36a875d58fd6832851fad11dccd1245758950523.tar.xz openshift-36a875d58fd6832851fad11dccd1245758950523.zip |
Merge pull request #2160 from sdodson/string-things
Convert openshift_release and openshift_version to strings for starts…
Diffstat (limited to 'roles')
-rw-r--r-- | roles/openshift_version/tasks/main.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index 2d96d2765..0a134f557 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -17,6 +17,10 @@ when: openshift_release is defined and openshift_release[0] == 'v' - set_fact: + openshift_release: "{{ openshift_release | string }}" + when: openshift_release is defined + +- set_fact: openshift_image_tag: "{{ 'v' + openshift_image_tag }}" when: openshift_image_tag is defined and openshift_image_tag[0] != 'v' @@ -26,7 +30,7 @@ # Make sure we copy this to a fact if given a var: - set_fact: - openshift_version: "{{ openshift_version }}" + openshift_version: "{{ openshift_version | string }}" when: openshift_version is defined # Protect the installed version by default unless explicitly told not to, or given an |