From: Pierre Blanc <pblanc@redhat.com>
Date: Fri, 13 Nov 2015 16:28:54 +0000 (-0500)
Subject: Fix cinder error when CinderNfsMountOptions option is absent
X-Git-Tag: opnfv-6.0.0~2314^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=02e9cac68e0de8f8a116be5f77c9b3ba89f916c0;p=apex-tripleo-heat-templates.git

Fix cinder error when CinderNfsMountOptions option is absent

When I deploy director with NFS backend for cinder,
sometimes I don't need nfs mount options.
If I choose to omit this option, or if the option
is defined to '', the deployment fails.

This patch add just a default value for this option.

Change-Id: Idf708aaecebd5c6db14f48ad2a53d6c2453be5ee
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1281870
---

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index f1c24f0d..34be39f3 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -381,7 +381,7 @@ if hiera('step') >= 3 {
     package {'nfs-utils': } ->
     cinder::backend::nfs { $cinder_nfs_backend :
       nfs_servers       => hiera('cinder_nfs_servers'),
-      nfs_mount_options => hiera('cinder_nfs_mount_options'),
+      nfs_mount_options => hiera('cinder_nfs_mount_options',''),
       nfs_shares_config => '/etc/cinder/shares-nfs.conf',
     }
   }
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 4f0dd72a..6cfa13ec 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -757,7 +757,7 @@ if hiera('step') >= 3 {
     package { 'nfs-utils': } ->
     cinder::backend::nfs { $cinder_nfs_backend:
       nfs_servers       => hiera('cinder_nfs_servers'),
-      nfs_mount_options => hiera('cinder_nfs_mount_options'),
+      nfs_mount_options => hiera('cinder_nfs_mount_options',''),
       nfs_shares_config => '/etc/cinder/shares-nfs.conf',
     }
   }