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/openshift_master/defaults | |
| 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/openshift_master/defaults')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 4030e1bfa..7d96a467e 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -53,12 +53,12 @@ oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_ur oreg_auth_credentials_path: "{{ r_openshift_master_data_dir }}/.docker" oreg_auth_credentials_replace: False l_bind_docker_reg_auth: False -openshift_docker_alternative_creds: "{{ (openshift_docker_use_system_container | default(False)) or (openshift_use_crio_only | default(False)) }}" +openshift_docker_alternative_creds: "{{ (openshift_docker_use_system_container | default(False) | bool) or (openshift_use_crio_only | default(False)) }}" containerized_svc_dir: "/usr/lib/systemd/system" ha_svc_template_path: "native-cluster" -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' }}" openshift_master_loopback_config: "{{ openshift_master_config_dir }}/openshift-master.kubeconfig" loopback_context_string: "current-context: {{ openshift.master.loopback_context_name }}" |