From 2e4f51f671b4e14fd58a67f1a22106c09c037eed Mon Sep 17 00:00:00 2001
From: Kyle Dean <k.s-dean@outlook.com>
Date: Wed, 21 Apr 2021 12:00:20 +0100
Subject: [PATCH] manila: add glance section in manila-share.conf

Since the Victoria release, manila-share.conf requires a glance section
for some drivers. This change adds the missing section.

It also uses the correct cinder_keystone_user variable to reference the
cinder user.

Closes-Bug: #1921935

Change-Id: Ib7ce4ed79c28456281087eb4156577f910c072e7
---
 ansible/group_vars/all.yml                         |  1 +
 .../roles/manila/templates/manila-share.conf.j2    | 14 +++++++++++++-
 .../notes/manila-glance-4524ed1e9d488a60.yaml      |  5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/manila-glance-4524ed1e9d488a60.yaml

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 2b9d8a8650..19f50727b2 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -701,6 +701,7 @@ nova_keystone_user: "nova"
 placement_keystone_user: "placement"
 murano_keystone_user: "murano"
 cinder_keystone_user: "cinder"
+glance_keystone_user: "glance"
 
 # Nova fake driver and the number of fake driver per compute node
 enable_nova_fake: "no"
diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2
index 51c946154f..5b9a528293 100644
--- a/ansible/roles/manila/templates/manila-share.conf.j2
+++ b/ansible/roles/manila/templates/manila-share.conf.j2
@@ -5,6 +5,18 @@ enabled_share_backends = {{ manila_enabled_backends|map(attribute='name')|join('
 
 default_share_type = default_share_type
 
+[glance]
+auth_url = {{ keystone_admin_url }}
+auth_type = password
+project_domain_id = {{ default_project_domain_id }}
+user_domain_id = {{ default_user_domain_id }}
+region_name = {{ openstack_region_name }}
+endpoint_type = internalURL
+project_name = service
+username = {{ glance_keystone_user }}
+password = {{ glance_keystone_password }}
+cafile = {{ openstack_cacert }}
+
 [cinder]
 auth_uri = {{ keystone_internal_url }}
 auth_url = {{ keystone_admin_url }}
@@ -14,7 +26,7 @@ user_domain_id = {{ default_user_domain_id }}
 region_name = {{ openstack_region_name }}
 endpoint_type = internalURL
 project_name = service
-username = cinder
+username = {{ cinder_keystone_user }}
 password = {{ cinder_keystone_password }}
 cafile = {{ openstack_cacert }}
 
diff --git a/releasenotes/notes/manila-glance-4524ed1e9d488a60.yaml b/releasenotes/notes/manila-glance-4524ed1e9d488a60.yaml
new file mode 100644
index 0000000000..1efc34d4bf
--- /dev/null
+++ b/releasenotes/notes/manila-glance-4524ed1e9d488a60.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes an issue with Manila configuration which was missing a ``[glance]``
+    section, preventing some drivers from operating.