diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-13 14:22:46 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-14 14:39:26 -0400 |
| commit | 2342cb2f47050d430ff7fb07e68e9e42006884eb (patch) | |
| tree | 4aea032e6c4958f3556a1a7721d9b78982cab029 /roles/openshift_docker/tasks | |
| parent | c298560ff539d23f60a83876feba83c970283ce7 (diff) | |
| download | openshift-2342cb2f47050d430ff7fb07e68e9e42006884eb.tar.gz openshift-2342cb2f47050d430ff7fb07e68e9e42006884eb.tar.bz2 openshift-2342cb2f47050d430ff7fb07e68e9e42006884eb.tar.xz openshift-2342cb2f47050d430ff7fb07e68e9e42006884eb.zip | |
Support mixed RPM/container installs
Diffstat (limited to 'roles/openshift_docker/tasks')
| -rw-r--r-- | roles/openshift_docker/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml index e5135520f..23613b762 100644 --- a/roles/openshift_docker/tasks/main.yml +++ b/roles/openshift_docker/tasks/main.yml @@ -6,15 +6,15 @@ command: > docker run --rm {{ openshift.common.cli_image }}:latest version register: cli_image_version - when: openshift.common.is_containerized | bool and openshift_image_tag is not defined + when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool and openshift_image_tag is not defined - set_fact: l_image_tag: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0] }}" - when: openshift.common.is_containerized | bool and openshift_image_tag is not defined + when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool and openshift_image_tag is not defined - set_fact: l_image_tag: "{{ openshift_image_tag }}" - when: openshift.common.is_containerized | bool and openshift_image_tag is defined + when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool and openshift_image_tag is defined - name: Set post docker install facts openshift_facts: @@ -25,4 +25,4 @@ local_facts: openshift_image_tag: "{{ l_image_tag }}" openshift_version: "{{ l_image_tag if l_image_tag is defined else '' | oo_image_tag_to_rpm_version }}" - when: openshift.common.is_containerized | bool + when: openshift.common.is_containerized is defined and openshift.common.is_containerized | bool |