summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/patches/0012-linux.storage.lvm-Disable-filter.patch35
-rw-r--r--mcp/patches/patches.list1
2 files changed, 36 insertions, 0 deletions
diff --git a/mcp/patches/0012-linux.storage.lvm-Disable-filter.patch b/mcp/patches/0012-linux.storage.lvm-Disable-filter.patch
new file mode 100644
index 000000000..de74fadcd
--- /dev/null
+++ b/mcp/patches/0012-linux.storage.lvm-Disable-filter.patch
@@ -0,0 +1,35 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sat, 18 Nov 2017 22:03:01 +0200
+Subject: [PATCH] linux.storage.lvm: Disable filter
+
+Due to upstream bug [1], mixing OS-managed LVM volumes with Cinder
+LVM volumes leads to a broken filter value in lvm.conf.
+Temporarily disable the filter (whitelisting all devices, similar
+to no-Cinder use-cases) until upstream bug is fixed.
+
+[1] https://github.com/salt-formulas/salt-formula-linux/issues/127
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+
+diff --git a/linux/files/lvm.conf b/linux/files/lvm.conf
+--- a/linux/files/lvm.conf
++++ b/linux/files/lvm.conf
+@@ -129,7 +129,8 @@
+ # Example
+ # Accept every block device:
+
+- filter = [ {%- for vgname, vg in storage.lvm.iteritems() %}{%- if vg.get('enabled', True) %}{%- for dev in vg.devices %}"a|{{ dev }}*|"{%- if not loop.last %},{%- endif %}{%- endfor %}{%- endif %}{%- endfor %}, "r|.*|" ]
++ # NOTE(opnfv): https://github.com/salt-formulas/salt-formula-linux/issues/127
++ # filter = [ {%- for vgname, vg in storage.lvm.iteritems() %}{%- if vg.get('enabled', True) %}{%- for dev in vg.devices %}"a|{{ dev }}*|"{%- if not loop.last %},{%- endif %}{%- endfor %}{%- endif %}{%- endfor %}, "r|.*|" ]
+
+ # filter = [ "a|.*/|" ]
+ # Reject the cdrom drive:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index fb5a14cda..d0bb7c431 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -16,3 +16,4 @@
/usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch
+/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch