openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Make devices filter in lvm.conf overridable

Browse Source 
Change-Id: I2700028965bd89abaa342df91014874c94daf06c
This commit is contained in:
Jakub Jursa 2018-09-05 16:18:48 +02:00 committed by Jonathan Rosser
parent 75019ed6c5
commit 826627c937
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@ -273,6 +273,13 @@ cinder_quota_backup_gigabytes: 1000
# - lvm_high_iops # - lvm_high_iops
# - lvm_low_iops # - lvm_low_iops
# Override generated device filter in lvm.conf
# Example:
# cinder_lvm_devices_filter_override:
# - '"a/sd.*/"'
# - '"a/hd.*/"'
cinder_lvm_devices_filter_override: []
# cinder_backend_lvm_inuse: True if current host has an lvm backend # cinder_backend_lvm_inuse: True if current host has an lvm backend
cinder_backend_lvm_inuse: '{{ (cinder_backends|default("")|to_json).find("lvm") != -1 }}' cinder_backend_lvm_inuse: '{{ (cinder_backends|default("")|to_json).find("lvm") != -1 }}'
# cinder_backend_rbd_inuse: True if the current host has an rbd backend # cinder_backend_rbd_inuse: True if the current host has an rbd backend

22
templates/lvm.conf.j2
View File

@ -1,17 +1,21 @@
# {{ ansible_managed }} # {{ ansible_managed }}
{% set used_lvm_devices = [] %} {% set used_lvm_devices = [] %}
{% set lv_devices = lvm_devices.stdout.split('\n') %} {% if cinder_lvm_devices_filter_override|length > 0 %}
{% if lv_devices|length > 0 %} {% set used_lvm_devices = cinder_lvm_devices_filter_override %}
{% for net in lv_devices %} {% else %}
{% if net != '' %} {% set lv_devices = lvm_devices.stdout.split('\n') %}
{% set lv_device = '"a/' + net + '/"' %} {% if lv_devices|length > 0 %}
{% if used_lvm_devices.append(lv_device) %}{% endif %} {% for net in lv_devices %}
{% endif %} {% if net != '' %}
{% endfor %} {% set lv_device = '"a/' + net + '/"' %}
{% endif %} {% if used_lvm_devices.append(lv_device) %}{% endif %}
{% endif %}
{% endfor %}
{% endif %}
# Ansible Discovered LVM Devices {{ lv_devices }} # Ansible Discovered LVM Devices {{ lv_devices }}
{% endif %}
{% if used_lvm_devices|length <= 0 %} {% if used_lvm_devices|length <= 0 %}
{# If there are no LVM devices present, allow all devices to be scanned #} {# If there are no LVM devices present, allow all devices to be scanned #}