From 1a99f2ee9fac6dfe02e56e227874371b40a0b4fe Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 2 Jan 2018 14:21:36 -0500
Subject: Cast openshift_docker_use_system_container to bool
openshift_docker_use_system_container might be passed
in via ini inventory as 'openshift_docker_use_system_container=false'
This condition will be interpreted as a string type, instead of
boolean.
Casting openshift_docker_use_system_container as bool
will achieve the users desired intent.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1528943
---
roles/flannel/defaults/main.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles/flannel/defaults')
diff --git a/roles/flannel/defaults/main.yaml b/roles/flannel/defaults/main.yaml
index 2e4a0dc39..d9e4d2354 100644
--- a/roles/flannel/defaults/main.yaml
+++ b/roles/flannel/defaults/main.yaml
@@ -6,4 +6,4 @@ etcd_peer_ca_file: "{{ openshift.common.config_base }}/node/flannel.etcd-ca.crt"
etcd_peer_cert_file: "{{ openshift.common.config_base }}/node/flannel.etcd-client.crt"
etcd_peer_key_file: "{{ openshift.common.config_base }}/node/flannel.etcd-client.key"
-openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_system_container | default(False)) else 'docker' }}"
+openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_system_container | default(False) | bool) else 'docker' }}"
--
cgit v1.2.3