openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Add missing CLI_OPTIONS when setting up qos volume types

Browse Source 
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
This commit is contained in:
David Moreau Simard 2019-02-10 17:39:27 -05:00
parent 08cbc0d5d5
commit 84fe27fe16
No known key found for this signature in database
GPG Key ID: CBEB466764A9E621
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasks/cinder_qos.yml
View File

@ -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: