Merge pull request #6658 from mgugino-upstream-stage/containerized_bools

Automatic merge from submit-queue.

ensure containerized bools are cast

roles/etcd/tasks/migration/migrate.yml

@@ -1,7 +1,7 @@
 ---
 # Should this be run in a serial manner?
 - set_fact:
-    l_etcd_service: "{{ 'etcd_container' if openshift_is_containerized else 'etcd' }}"
+    l_etcd_service: "{{ 'etcd_container' if (openshift_is_containerized | bool) else 'etcd' }}"
 
 - name: Migrate etcd data
   command: >

roles/openshift_etcd_facts/vars/main.yml

@@ -1,5 +1,5 @@
 ---
-etcd_is_containerized: "{{ openshift_is_containerized }}"
+etcd_is_containerized: "{{ openshift_is_containerized | bool }}"
 etcd_is_atomic: "{{ openshift_is_atomic }}"
 etcd_hostname: "{{ openshift.common.hostname }}"
 etcd_ip: "{{ openshift.common.ip }}"

roles/openshift_facts/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-openshift_client_binary: "{{ openshift_is_containerized | ternary('/usr/local/bin/oc', 'oc') }}"
+openshift_client_binary: "{{ (openshift_is_containerized | bool) | ternary('/usr/local/bin/oc', 'oc') }}"
 
 openshift_cli_image_dict:
   origin: 'openshift/origin'

roles/openshift_node/tasks/upgrade/config_changes.yml

@@ -1,7 +1,7 @@
 ---
 - name: Update systemd units
   include_tasks: ../systemd_units.yml
-  when: openshift_is_containerized
+  when: openshift_is_containerized | bool
 
 - name: Update oreg value
   yedit: