From 1bdc286352709db8d3d9aaa5af178a147cf83508 Mon Sep 17 00:00:00 2001
From: PranaliD <pdeore@redhat.com>
Date: Tue, 2 Feb 2021 09:29:26 -0500
Subject: [PATCH] Handle cinder_mount_point_base for cinder mounting needs

Adding cinder_mount_point_base parameter, to provide the
mount point for *fs volumes.

Depends-On: Ib724f6e895716847827be48ed08b01a7a312338f
Change-Id: I3f9004fd8abffefe8cfeee9011ed0e323652fdd1
(cherry picked from commit a2dbbaedabf81ac8dd5438eee3857c4a29b95f1a)
(cherry picked from commit 1234d16497d26c1e5f1ac249f9800358820a9dec)
(cherry picked from commit e97541284aa1dae2d64dd794a28cfbc84339bf6b)
---
 manifests/profile/base/glance/backend/cinder.pp             | 6 ++++++
 .../tripleo_profile_base_glance_backend_cinder_spec.rb      | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/manifests/profile/base/glance/backend/cinder.pp b/manifests/profile/base/glance/backend/cinder.pp
index b29ee497c..e7714675d 100644
--- a/manifests/profile/base/glance/backend/cinder.pp
+++ b/manifests/profile/base/glance/backend/cinder.pp
@@ -69,6 +69,10 @@
 #   (Optional) Set to True when multipathd is enabled
 #   Defaults to hiera('glance::backend::cinder::cinder_use_multipath', undef)
 #
+# [*cinder_mount_point_base*]
+#   (Optional) Directory where the NFS volume is mounted on the glance node.
+#   Defaults to hiera('glance::backend::cinder::cinder_mount_point_base', undef)
+#
 # [*store_description*]
 #   (Optional) Provides constructive information about the store backend to
 #   end users.
@@ -93,6 +97,7 @@ class tripleo::profile::base::glance::backend::cinder (
   $cinder_store_password       = hiera('glance::backend::cinder::cinder_store_password', undef),
   $cinder_enforce_multipath    = hiera('glance::backend::cinder::cinder_enforce_multipath', undef),
   $cinder_use_multipath        = hiera('glance::backend::cinder::cinder_use_multipath', undef),
+  $cinder_mount_point_base     = hiera('glance::backend::cinder::cinder_mount_point_base', undef),
   $store_description           = hiera('tripleo::profile::base::glance::api::glance_store_description', 'Cinder store'),
   $step                        = Integer(hiera('step')),
 ) {
@@ -119,6 +124,7 @@ class tripleo::profile::base::glance::backend::cinder (
       cinder_store_password       => $cinder_store_password,
       cinder_enforce_multipath    => $cinder_enforce_multipath,
       cinder_use_multipath        => $cinder_use_multipath,
+      cinder_mount_point_base     => $cinder_mount_point_base,
       store_description           => $store_description_real,
     }
   }
diff --git a/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb b/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
index f2fdf37fe..5f91d4503 100644
--- a/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
+++ b/spec/classes/tripleo_profile_base_glance_backend_cinder_spec.rb
@@ -49,6 +49,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
         :cinder_store_password       => 'glance_password',
         :cinder_enforce_multipath    => true,
         :cinder_use_multipath        => true,
+        :cinder_mount_point_base     => '/var/lib/glance/mnt/nfs',
         :step                        => 4,
       } }
 
@@ -65,6 +66,7 @@ describe 'tripleo::profile::base::glance::backend::cinder' do
           :cinder_store_password       => 'glance_password',
           :cinder_enforce_multipath    => true,
           :cinder_use_multipath        => true,
+          :cinder_mount_point_base     => '/var/lib/glance/mnt/nfs',
           :store_description           => 'Cinder store',
         )
       end