From: Marc Methot <mmethot@redhat.com>
Date: Tue, 13 Jun 2017 19:23:54 +0000 (-0400)
Subject: Fixes an issue when rebooting with an NFS mount.
X-Git-Tag: opnfv-6.0.0~144^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=96c4adecb2b6ff51d1a3b63a4219e107d0172d1b;p=apex-puppet-tripleo.git

Fixes an issue when rebooting with an NFS mount.

_netdev mount option helps fix a timing issue when rebooting.
This looks like we're hitting an issue where we're using
network instead of NetworkManager and that systemd doesn't
unmount the NFS shares before stopping network.

Change-Id: I5d2c89db29ef75aaf371b3c9dd561587d7b6f87b
Closes-Bug: #1697752
---

diff --git a/manifests/glance/nfs_mount.pp b/manifests/glance/nfs_mount.pp
index 035191d..674bdd0 100644
--- a/manifests/glance/nfs_mount.pp
+++ b/manifests/glance/nfs_mount.pp
@@ -43,7 +43,7 @@ class tripleo::glance::nfs_mount (
   $options               = 'intr,context=system_u:object_r:glance_var_lib_t:s0',
   $edit_fstab            = true,
   $fstab_fstype          = 'nfs4',
-  $fstab_prepend_options = 'bg'
+  $fstab_prepend_options = '_netdev,bg'
 ) {
 
   $images_dir = '/var/lib/glance/images'