From 84fe27fe169f70fcd39a560f1309a8983cf09e84 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Sun, 10 Feb 2019 17:39:27 -0500 Subject: [PATCH] Add missing CLI_OPTIONS when setting up qos volume types We were already setting up CLI_OPTIONS based on security parameters but we were not including it in the actual command. This made it impossible to use when using insecure SSL certificates. This is the same approach as used in the cinder_backends.yml task file. Change-Id: I6e1448e42ef3e955bb6e31ffa9334761e5cb3060 --- tasks/cinder_qos.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/cinder_qos.yml b/tasks/cinder_qos.yml index 37a93c5b..eed27424 100644 --- a/tasks/cinder_qos.yml +++ b/tasks/cinder_qos.yml @@ -17,8 +17,8 @@ shell: | . {{ ansible_env.HOME }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" - {{ cinder_bin }}/openstack volume qos list --format value --column Name | grep -x {{ item.name }} || \ - {{ cinder_bin }}/openstack volume qos create {{ item.name }} \ + {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume qos list --format value --column Name | grep -x {{ item.name }} || \ + {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume qos create {{ item.name }} \ --consumer {{ item.options.consumer }}\ {% for k,v in item.options.items() %} --property {{ k }}={{ v }}{% endfor %} args: @@ -33,8 +33,8 @@ . {{ ansible_env.HOME }}/openrc CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" {% for vtype in item.cinder_volume_types %} - if {{ cinder_bin }}/openstack volume type show "{{ vtype }}"; then - {{ cinder_bin }}/openstack volume qos associate {{ item.name }} {{ vtype }} + if {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume type show "{{ vtype }}"; then + {{ cinder_bin }}/openstack ${CLI_OPTIONS} volume qos associate {{ item.name }} {{ vtype }} fi {% endfor %} args: