Change-Id: I556ab82a1dc0ce711958404165e419275ff5ce19pull/115/head
@@ -129,7 +129,7 @@ devices { | |||
# Example | |||
# Accept every block device: | |||
filter = [ "r|/dev/sd.*|","r|/dev/mapper/.*|","r|/dev/.*/by-id/.*|", "r|/dev/.*/by-path/.*|" ] | |||
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: |
@@ -145,6 +145,7 @@ | |||
'mount': {}, | |||
'swap': {}, | |||
'lvm': {}, | |||
'lvm_services': ['lvm2', 'lvm2-lvmetad', 'lvm2-lvmpolld', 'lvm2-monitor'], | |||
'loopback': {}, | |||
'nfs': { | |||
'pkgs': ['nfs-utils'] | |||
@@ -159,6 +160,7 @@ | |||
'mount': {}, | |||
'swap': {}, | |||
'lvm': {}, | |||
'lvm_services': ['lvm2', 'lvm2-lvmetad', 'lvm2-lvmpolld', 'lvm2-monitor'], | |||
'loopback': {}, | |||
'nfs': { | |||
'pkgs': ['nfs-common'] | |||
@@ -174,6 +176,7 @@ | |||
'mount': {}, | |||
'swap': {}, | |||
'lvm': {}, | |||
'lvm_services': ['lvm2', 'lvm2-lvmetad', 'lvm2-lvmpolld', 'lvm2-monitor'], | |||
'loopback': {}, | |||
'nfs': { | |||
'pkgs': ['nfs-utils'] |
@@ -54,4 +54,13 @@ lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}: | |||
- require: | |||
- pkg: linux_lvm_pkgs | |||
lvm_services: | |||
service.running: | |||
- enable: true | |||
- names: {{ storage.lvm_services }} | |||
- require: | |||
- file: /etc/lvm/lvm.conf | |||
- watch: | |||
- file: /etc/lvm/lvm.conf | |||
{%- endif %} |