From 2342cb2f47050d430ff7fb07e68e9e42006884eb Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Wed, 13 Apr 2016 14:22:46 -0400 Subject: Support mixed RPM/container installs --- roles/openshift_docker/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/openshift_docker') 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 -- cgit v1.2.1