Merge "move lvm config and service before managing VG and LV"
diff --git a/linux/storage/lvm.sls b/linux/storage/lvm.sls
index e88c2f1..2a0a67c 100644
--- a/linux/storage/lvm.sls
+++ b/linux/storage/lvm.sls
@@ -5,6 +5,23 @@
pkg.installed:
- pkgs: {{ storage.lvm_pkgs }}
+
+/etc/lvm/lvm.conf:
+ file.managed:
+ - source: salt://linux/files/lvm.conf
+ - template: jinja
+ - 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
+
{%- for vgname, vg in storage.lvm.iteritems() %}
{%- if vg.get('enabled', True) %}
@@ -15,6 +32,8 @@
- name: {{ dev }}
- require:
- pkg: linux_lvm_pkgs
+ - file: /etc/lvm/lvm.conf
+ - service: lvm_services
- require_in:
- lvm: lvm_vg_{{ vg.get('name', vgname) }}
{%- endfor %}
@@ -47,20 +66,4 @@
{%- endfor %}
-/etc/lvm/lvm.conf:
- file.managed:
- - source: salt://linux/files/lvm.conf
- - template: jinja
- - 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 %}
+{%- endif %}
\ No newline at end of file