commit bb19cd4eb4081c0f0aeb58507de0b5bdc67490a9
author Denis Meltsaykin <dmeltsaykin@mirantis.com> Tue May 11 08:54:52 2021 +0000
committer Gerrit Code Review <gerrit@1851aeab26e9> Tue May 11 08:54:52 2021 +0000
tree a210c5ff529ca161587648c4cdf3b53cc3adfd74
parent eee7c774df7644b908c0e5ef4a36c954265b9833
parent 08cb4c8f5b75338e8546d3d3a7b9d1760e200741

Merge "Fix for lvm_filters in case if storage.lvm is not defined."

README.rst

diff --git a/README.rst b/README.rst
index 4e799e6..9a9b344 100644
--- a/README.rst
+++ b/README.rst
@@ -2500,6 +2500,7 @@
     parameters:
       linux:
         storage:
+          enabled: true
           mount:
             data:
               enabled: true

linux/map.jinja

diff --git a/linux/map.jinja b/linux/map.jinja
index 6f92119..9068aa2 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -349,6 +349,7 @@
         'swap': {},
         'disk': {},
         'lvm': {},
+        'lvm_filters': {},
         'lvm_services': ['lvm2-lvmetad', 'lvm2-lvmpolld', 'lvm2-monitor'],
         'loopback': {},
         'nfs': {
@@ -364,6 +365,7 @@
         'mount': {},
         'swap': {},
         'lvm': {},
+        'lvm_filters': {},
         'disk': {},
         'lvm_services': ['lvm2-lvmetad', 'lvm2-lvmpolld', 'lvm2-monitor'],
         'loopback': {},
@@ -381,6 +383,7 @@
         'mount': {},
         'swap': {},
         'lvm': {},
+        'lvm_filters': {},
         'disk': {},
         'lvm_services': ['lvm2-lvmetad', 'lvm2-lvmpolld', 'lvm2-monitor'],
         'loopback': {},

linux/storage/init.sls

diff --git a/linux/storage/init.sls b/linux/storage/init.sls
index b996b73..6668b51 100644
--- a/linux/storage/init.sls
+++ b/linux/storage/init.sls
@@ -1,22 +1,22 @@
 {%- from "linux/map.jinja" import storage with context %}
-{%- if storage.mount|length > 0 or storage.swap|length > 0 or storage.multipath.enabled or storage.disk|length > 0 or storage.lvm|length > 0 or storage.loopback|length > 0 %}
+{%- if storage.mount|length > 0 or storage.swap|length > 0 or storage.multipath.enabled or storage.disk|length > 0 or storage.lvm|length > 0 or storage.lvm_filters|length > 0 or storage.loopback|length > 0 %}
 include:
-{%- if storage.loopback|length > 0 %}
+  {%- if storage.loopback|length > 0 %}
 - linux.storage.loopback
-{%- endif %}
-{%- if storage.disk|length > 0 %}
+  {%- endif %}
+  {%- if storage.disk|length > 0 %}
 - linux.storage.disk
-{%- endif %}
-{%- if storage.lvm|length > 0 %}
+  {%- endif %}
+  {%- if storage.lvm|length > 0 or storage.lvm_filters|length > 0 %}
 - linux.storage.lvm
-{%- endif %}
-{%- if storage.mount|length > 0 %}
+  {%- endif %}
+  {%- if storage.mount|length > 0 %}
 - linux.storage.mount
-{%- endif %}
-{%- if storage.swap|length > 0 %}
+  {%- endif %}
+  {%- if storage.swap|length > 0 %}
 - linux.storage.swap
-{%- endif %}
-{%- if storage.multipath.enabled %}
+  {%- endif %}
+  {%- if storage.multipath.enabled %}
 - linux.storage.multipath
-{%- endif %}
+  {%- endif %}
 {%- endif %}