Merge "Allow configuring cinder mount point for glance cinder store" …

…into stable/train
openstack-archive · Mar 29, 2021 · 48ac15a · 48ac15a
2 parents 86bc2f4 + b9dd8cc
commit 48ac15a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
@@ -248,6 +248,12 @@ parameters:
           cinder_store:
             GlanceBackend: cinder
             GlanceStoreDescription: 'Cinder store'
+  GlanceCinderMountPointBase:
+    default: '/var/lib/glance/mnt'
+    type: string
+    description: |
+      The mount point base when glance is using cinder as store and cinder backend
+      is NFS. This mount point is where the NFS volume is mounted on the glance node.
   CephClientUserName:
     default: openstack
     type: string
@@ -489,6 +495,7 @@ outputs:
               glance::backend::cinder::cinder_store_project_name: 'service'
               glance::backend::cinder::cinder_store_user_name: 'glance'
               glance::backend::cinder::cinder_store_password: {get_param: GlancePassword}
+              tripleo::profile::base::glance::backend::cinder::cinder_mount_point_base: {get_param: GlanceCinderMountPointBase}
             - {}
           -
             if:

diff --git a/releasenotes/notes/add-glance-cinder-mount-point-base-parameter-852554398b9f3a19.yaml b/releasenotes/notes/add-glance-cinder-mount-point-base-parameter-852554398b9f3a19.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    The new parameter GlanceCinderMountPointBase has been added which will be used
+    for mounting NFS volumes on glance nodes.
+    When glance uses cinder as store and cinder backend is NFS, this parameter must
+    be set to match cinder's mount point.