diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-04 11:32:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 11:32:51 -0400 |
| commit | c6685cfb5d91c7c7361113aa06506f81dac60375 (patch) | |
| tree | 61c586064d2c097f27ac4c14609f00bbcdc36dcc /roles | |
| parent | 19e187eb72e89fccb075bd943d7761b6fc3dfe44 (diff) | |
| parent | 186782e353928eba6374d688dc5b50278af00629 (diff) | |
| download | openshift-c6685cfb5d91c7c7361113aa06506f81dac60375.tar.gz openshift-c6685cfb5d91c7c7361113aa06506f81dac60375.tar.bz2 openshift-c6685cfb5d91c7c7361113aa06506f81dac60375.tar.xz openshift-c6685cfb5d91c7c7361113aa06506f81dac60375.zip | |
Merge pull request #4925 from ingvagabund/set-openshift_version-to-openshift_common_version_if_empty
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index f4cb8ddb2..a6b8a40c8 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -81,7 +81,7 @@ openshift_version: "{{ openshift.common.version }}" when: - openshift.common.version is defined - - openshift_version is not defined + - openshift_version is not defined or openshift_version == "" - openshift_protect_installed_version | bool # The rest of these tasks should only execute on |