From 91ea6c73615a3c5530cc405ec4230e236d3872cd Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 10 Jan 2019 09:42:07 +0000 Subject: [PATCH] Ensure public volume type option is evaluated as a boolean To ensure that all boolean types supported by ansible are evaluated, and to ensure thhat it is evaluated as a boolean, we use the bool filter. Related-Bug: 1804438 Change-Id: I76ee77958d7e1bf94089b917ac064db4e97d1ad9 --- tasks/cinder_backends.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/cinder_backends.yml b/tasks/cinder_backends.yml index 28466339..8782097e 100644 --- a/tasks/cinder_backends.yml +++ b/tasks/cinder_backends.yml @@ -41,7 +41,7 @@ . {{ ansible_env.HOME }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" if ! {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type show "{{ item.key }}"; then - {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type create --property volume_backend_name="{{ item.value.volume_backend_name }}" {% if not item.value.public|default(True) %} --private {% endif %} "{{ item.key }}" + {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type create --property volume_backend_name="{{ item.value.volume_backend_name }}" {% if not (item.value.public | default(True)) | bool %} --private {% endif %} "{{ item.key }}" fi args: executable: /bin/bash @@ -54,7 +54,7 @@ CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" {% for evtype in item.value.extra_volume_types %} if ! {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type show "{{ evtype }}"; then - {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type create --property volume_backend_name="{{ item.value.volume_backend_name }}" {% if not item.value.public|default(True) %} --private {% endif %} "{{ evtype }}" + {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type create --property volume_backend_name="{{ item.value.volume_backend_name }}" {% if not (item.value.public | default(True)) | bool %} --private {% endif %} "{{ evtype }}" fi {% endfor %} args: