openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

tasks: cinder_qos: Use exact match for QoS rules

Browse Source 
The default grep behavior will match any part of the string which
means that rules like 'foo' and 'foo-plus' will be matched if we are
only interested in 'foo'. As such, this is causing problems with QoS
rules which happen to have overlapping names. It's best to use
'grep -x' to only match the rule we are interested in.

Closes-Bug: #1741990
Change-Id: I26f7f4a933e1b96ba7a92efc79f1b87c806ccdc3
This commit is contained in:
Markos Chandras 2018-01-10 11:12:58 +00:00
parent f807cdccfb
commit 4a9a00fb3b
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: |
. {{ ansible_env.HOME }}/openrc
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 }}\
{% for k,v in item.options.items() %} {{ k }}={{ v }}{% endfor %}
args:
@ -33,8 +33,8 @@
CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}"
{% for vtype in item.cinder_volume_types %}
{{ cinder_bin }}/cinder qos-associate \
$({{ cinder_bin }}/cinder qos-list | grep {{ item.name }} | grep -oE "{{ _UUID_regex }}") \
$({{ cinder_bin }}/cinder type-list | grep {{ vtype }} | grep -oE "{{ _UUID_regex }}")
$({{ cinder_bin }}/cinder qos-list | grep -x {{ item.name }} | grep -oE "{{ _UUID_regex }}") \
$({{ cinder_bin }}/cinder type-list | grep -x {{ vtype }} | grep -oE "{{ _UUID_regex }}")
{% endfor %}
args:
executable: /bin/bash