4a9a00fb3b
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
47 lines
1.8 KiB
YAML
47 lines
1.8 KiB
YAML
---
|
|
# Copyright 2016, Walmart Stores, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
- name: Add in cinder qos types
|
|
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 -x {{ item.name }} || \
|
|
{{ cinder_bin }}/cinder qos-create {{ item.name }}\
|
|
{% for k,v in item.options.items() %} {{ k }}={{ v }}{% endfor %}
|
|
args:
|
|
executable: /bin/bash
|
|
with_items: "{{ cinder_qos_specs }}"
|
|
changed_when: false
|
|
tags:
|
|
- cinder-qos
|
|
|
|
- name: Associate qos types to volume types
|
|
shell: |
|
|
. {{ 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 %}
|
|
{{ cinder_bin }}/cinder qos-associate \
|
|
$({{ 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
|
|
with_items: "{{ cinder_qos_specs }}"
|
|
when:
|
|
- item.cinder_volume_types is defined
|
|
tags:
|
|
- cinder-qos
|
|
- cinder-qos-associate
|