diff options
| -rw-r--r-- | data/params/Debian.yaml | 4 | ||||
| -rw-r--r-- | manifests/brick.pp | 6 | ||||
| -rw-r--r-- | manifests/params.pp | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/data/params/Debian.yaml b/data/params/Debian.yaml index 1c051bc..d0e2a9b 100644 --- a/data/params/Debian.yaml +++ b/data/params/Debian.yaml @@ -14,4 +14,8 @@ gluster::params::program_fping: '/usr/bin/fping' gluster::params::program_awk: '/usr/bin/awk' # TODO: the debian family of glusterd needs a reload command in the init file ! gluster::params::misc_gluster_reload: '/usr/sbin/service glusterfs-server restart' + +# Debian based OS use nobootwait whereas Fedora based OS use nofail. +gluster::params::misc_mount_nofail: 'nobootwait' + # vim: ts=8 diff --git a/manifests/brick.pp b/manifests/brick.pp index 371be49..4ebdcb1 100644 --- a/manifests/brick.pp +++ b/manifests/brick.pp @@ -340,7 +340,7 @@ define gluster::brick( default => '', } - $options_list = ["${option01}", "${option02}"] + $options_list = ["${option01}", "${option02}","${::gluster::params::misc_mount_nofail}"] } elsif ( $valid_fstype == 'ext4' ) { # exec requires @@ -351,7 +351,7 @@ define gluster::brick( $mkfs_exec = "${::gluster::params::program_mkfs_ext4} -U '${valid_fsuuid}' ${dev2}" # mount options - $options_list = [] # TODO + $options_list = ["${::gluster::params::misc_mount_nofail}"] # TODO } elsif ( $valid_fstype == 'btrfs' ) { # exec requires @@ -364,7 +364,7 @@ define gluster::brick( $mkfs_exec = "${::gluster::params::program_mkfs_btrfs} -U '${valid_fsuuid}' ${dev2}" # mount options - $options_list = [] # TODO + $options_list = ["${::gluster::params::misc_mount_nofail}"] # TODO } else { fail('The $fstype is invalid.') diff --git a/manifests/params.pp b/manifests/params.pp index d53c599..5f16f86 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -79,6 +79,9 @@ class gluster::params( # the operatingsystemrelease string used in the repository URL. $misc_repo_operatingsystemrelease = "${operatingsystemrelease}", + # A failed or missing /etc/fstab entry should not cause the system to hang. + $misc_mount_nofail = 'nofail', + # comment... $comment = '' |