renamed fs_type to type for volumes
Change-Id: I876c9462a2625453e88488b8407af4ea25e77ae0
diff --git a/README.rst b/README.rst
index 4382320..f8ef542 100644
--- a/README.rst
+++ b/README.rst
@@ -255,11 +255,11 @@
volume:
tmp:
size: 5G
- fs_type: ext4
+ type: ext4
mount: '/tmp'
log:
size: 7G
- fs_type: ext4
+ type: ext4
mount: '/var/log'
Usage of local repos
diff --git a/_states/maasng.py b/_states/maasng.py
index 5a1eb28..3210e5d 100644
--- a/_states/maasng.py
+++ b/_states/maasng.py
@@ -119,7 +119,7 @@
#a. validate count of partitions
#b. validate size of partitions
#2. If not delete all partitions on disk and recreate schema
- #3. Validate fs_type exists
+ #3. Validate type exists
#if should not exits
#delete mount and unformat
#4. Validate mount exists
@@ -231,7 +231,7 @@
return ret
-def volume_present(hostname, name, volume_group_name, size, fs_type=None, mount=None):
+def volume_present(hostname, name, volume_group_name, size, type=None, mount=None):
'''
Ensure that the disk layout does exist
@@ -260,7 +260,7 @@
#TODO validation if exists
- ret["changes"] = __salt__['maasng.create_volume'](hostname, name, volume_group_name, size, fs_type, mount)
+ ret["changes"] = __salt__['maasng.create_volume'](hostname, name, volume_group_name, size, type, mount)
return ret
diff --git a/maas/machines/storage.sls b/maas/machines/storage.sls
index d71bede..6e138f9 100644
--- a/maas/machines/storage.sls
+++ b/maas/machines/storage.sls
@@ -128,8 +128,8 @@
- name: {{ volume_name }}
- volume_group_name: {{ disk_name }}
- size: {{ volume.size }}
- {%- if volume.fs_type is defined %}
- - fs_type: {{ volume.fs_type }}
+ {%- if volume.type is defined %}
+ - type: {{ volume.type }}
{%- endif %}
{%- if volume.mount is defined %}
- mount: {{ volume.mount }}