Merge pull request #676 from dsavineau/fix-nfs-mount

Nova/Glance: Mount nfs device with puppet

manifests/compute/hypervisor.pp

@@ -127,7 +127,7 @@ class cloud::compute::hypervisor(
         nova_config { 'DEFAULT/instances_path': value => $filesystem_store_datadir; }
         $nfs_mount = {
           "${filesystem_store_datadir}" => {
-            'ensure'  => 'present',
+            'ensure'  => 'mounted',
             'fstype'  => 'nfs',
             'device'  => $nfs_device,
             'options' => $nfs_options

manifests/image/api.pp

@@ -204,7 +204,7 @@ class cloud::image::api(
       }
       $nfs_mount = {
         "${filesystem_store_datadir}" => {
-          'ensure'  => 'present',
+          'ensure'  => 'mounted',
           'fstype'  => 'nfs',
           'device'  => $nfs_device,
           'options' => $nfs_options

spec/classes/cloud_compute_hypervisor_spec.rb

@@ -500,7 +500,7 @@ describe 'cloud::compute::hypervisor' do
       it 'configure nova instances path and NFS mount' do
         is_expected.to contain_nova_config('DEFAULT/instances_path').with('value' => '/var/lib/nova/instances')
         is_expected.to contain_mount('/var/lib/nova/instances').with({
-          'ensure'  => 'present',
+          'ensure'  => 'mounted',
           'fstype'  => 'nfs',
           'device'  => 'nfs.example.com:/vol1',
           'options' => 'noacl,fsid=123'

spec/classes/cloud_image_api_spec.rb

@@ -121,7 +121,7 @@ describe 'cloud::image::api' do
         is_expected.to contain_glance_api_config('DEFAULT/filesystem_store_datadir').with('value' => '/srv/images/')
         is_expected.to contain_glance_api_config('DEFAULT/default_store').with('value' => 'file')
         is_expected.to contain_mount('/srv/images/').with({
-          'ensure'  => 'present',
+          'ensure'  => 'mounted',
           'fstype'  => 'nfs',
           'device'  => 'nfs.example.com:/vol1',
           'options' => 'noacl,fsid=123',