Update state name for mount.path
PROD-31877
Change-Id: I6f36cbc32058d573453e897c1034e2698df2ac44
diff --git a/linux/storage/lvm.sls b/linux/storage/lvm.sls
index d53ad13..5bd582f 100644
--- a/linux/storage/lvm.sls
+++ b/linux/storage/lvm.sls
@@ -66,7 +66,7 @@
- lvm: lvm_vg_{{ vg.get('name', vgname) }}
{%- if volume.mount is defined %}
- require_in:
- - mount: {{ volume.mount.path }}
+ - mount: mount_path_{{ volume.mount.path }}
{%- if not volume.mount.get('file_system', None) in ['nfs', 'nfs4', 'cifs', 'tmpfs', None] %}
- cmd: mkfs_{{ volume.mount.device}}
{%- endif %}
diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index 90e9bd1..39e33ee 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -12,7 +12,7 @@
- name: "mkfs.{{ mount.file_system }} -L {{ name }} {{ mount.device }}"
- onlyif: "test `blkid {{ mount.device }} | grep -q TYPE;echo $?` -eq 1"
- require_in:
- - mount: {{ mount.path }}
+ - mount: mount_path_{{ mount.path }}
{%- if mount.file_system == 'xfs' %}
- require:
- pkg: xfs_packages_{{ mount.device }}
@@ -30,8 +30,9 @@
- pkgs: {{ storage.nfs.pkgs }}
{%- endif %}
-{{ mount.path }}:
+mount_path_{{ mount.path }}:
mount.mounted:
+ - name: {{ mount.path }}
- device: {{ mount.device }}
- fstype: {{ mount.file_system }}
- mkmnt: True
@@ -49,7 +50,7 @@
- group: {{ mount.get('group', 'root') }}
- mode: {{ mount.get('mode', 755) }}
- require:
- - mount: {{ mount.path }}
+ - mount: mount_path_{{ mount.path }}
{%- endif %}
{%- endif %}