From 31cce8cec36620f3d737fc56a05da2080de30b22 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dimitri.savineau@enovance.com>
Date: Fri, 10 Oct 2014 10:39:19 -0400
Subject: [PATCH] Nova/Glance: Mount nfs device with puppet

With 'ensure => present' in types::nfs we have only fstab configured.
Change it to 'ensure => mounted' it mount the device during puppet agent.

Signed-off-by: Dimitri Savineau <dimitri.savineau@enovance.com>
---
 manifests/compute/hypervisor.pp               | 2 +-
 manifests/image/api.pp                        | 2 +-
 spec/classes/cloud_compute_hypervisor_spec.rb | 2 +-
 spec/classes/cloud_image_api_spec.rb          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index be8a5b71..590fdc7e 100644
--- a/manifests/compute/hypervisor.pp
+++ b/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
diff --git a/manifests/image/api.pp b/manifests/image/api.pp
index 34b93b3f..a627db7b 100644
--- a/manifests/image/api.pp
+++ b/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
diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb
index 3429c364..678c89cd 100644
--- a/spec/classes/cloud_compute_hypervisor_spec.rb
+++ b/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'
diff --git a/spec/classes/cloud_image_api_spec.rb b/spec/classes/cloud_image_api_spec.rb
index b457cf20..e05c664c 100644
--- a/spec/classes/cloud_image_api_spec.rb
+++ b/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',