openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "tasks: cinder_qos: Use exact match for QoS rules"

Browse Source
This commit is contained in:
Zuul 2018-02-01 18:42:20 +00:00 committed by Gerrit Code Review
commit 0d3a156d2c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/cinder_qos.yml
View File

@ -17,7 +17,7 @@
shell: | shell: |
. {{ ansible_env.HOME }}/openrc . {{ ansible_env.HOME }}/openrc
CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}"
{{ cinder_bin }}/cinder qos-list | grep {{ item.name }} || \ {{ cinder_bin }}/cinder qos-list | grep -x {{ item.name }} || \
{{ cinder_bin }}/cinder qos-create {{ item.name }}\ {{ cinder_bin }}/cinder qos-create {{ item.name }}\
{% for k,v in item.options.items() %} {{ k }}={{ v }}{% endfor %} {% for k,v in item.options.items() %} {{ k }}={{ v }}{% endfor %}
args: args:
@ -33,8 +33,8 @@
CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}" CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}"
{% for vtype in item.cinder_volume_types %} {% for vtype in item.cinder_volume_types %}
{{ cinder_bin }}/cinder qos-associate \ {{ cinder_bin }}/cinder qos-associate \
$({{ cinder_bin }}/cinder qos-list | grep {{ item.name }} | grep -oE "{{ _UUID_regex }}") \ $({{ cinder_bin }}/cinder qos-list | grep -x {{ item.name }} | grep -oE "{{ _UUID_regex }}") \
$({{ cinder_bin }}/cinder type-list | grep {{ vtype }} | grep -oE "{{ _UUID_regex }}") $({{ cinder_bin }}/cinder type-list | grep -x {{ vtype }} | grep -oE "{{ _UUID_regex }}")
{% endfor %} {% endfor %}
args: args:
executable: /bin/bash executable: /bin/bash