diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-03 01:33:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 01:33:02 -0800 |
| commit | 79e1bf6974e7c107a20b510d664c09a26e0fe88d (patch) | |
| tree | 4cd38c12f68027c3b3b9069cfd2e5b6cfa8ee402 /roles/flannel | |
| parent | 19d1642c26d99f9059b70222a157532f539dcaa8 (diff) | |
| parent | 1a99f2ee9fac6dfe02e56e227874371b40a0b4fe (diff) | |
| download | openshift-79e1bf6974e7c107a20b510d664c09a26e0fe88d.tar.gz openshift-79e1bf6974e7c107a20b510d664c09a26e0fe88d.tar.bz2 openshift-79e1bf6974e7c107a20b510d664c09a26e0fe88d.tar.xz openshift-79e1bf6974e7c107a20b510d664c09a26e0fe88d.zip | |
Merge pull request #6586 from mgugino-upstream-stage/cast-bool-openshift_docker_use_system_container
Automatic merge from submit-queue.
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
Diffstat (limited to 'roles/flannel')
| -rw-r--r-- | roles/flannel/defaults/main.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
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' }}" |