Support ext4 and xfs for formatting empty filesystems

Signed-off-by: Mattias Gees <mattias.gees@gmail.com>

Author: MattiasGees

puppet/modules/aws_ebs/manifests/mount.pp

@@ -17,7 +17,7 @@
   String $dest_path,
   String $device,
   Boolean $is_not_attached,
-  Enum['xfs'] $filesystem = 'xfs',
+  Enum['xfs', 'ext4'] $filesystem = 'xfs',
 ){
   require ::aws_ebs
 

puppet/modules/aws_ebs/templates/ensure-volume-formatted.service.erb

@@ -8,7 +8,7 @@ After=<%= @attach_service_name %>
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=<%= scope['aws_ebs::format_bin_path'] %> <%= @device %>
+ExecStart=<%= scope['aws_ebs::format_bin_path'] %> <%= @device %> <%= @filesystem %>
 
 [Install]
 WantedBy=multiuser.target

puppet/modules/aws_ebs/templates/ensure_volume_formatted.sh.erb

@@ -2,5 +2,6 @@
 
 PATH=/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 DEVICE=$1
+FILESYSTEM=$2
 
-blkid "${DEVICE}" || (wipefs -fa "${DEVICE}" && mkfs.xfs "${DEVICE}")
+blkid "${DEVICE}" || (wipefs -fa "${DEVICE}" && mkfs.${FILESYSTEM} "${DEVICE}")