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
(cherry picked from commit 2e4f51f)

Author: k-s-dean

ansible/group_vars/all.yml

@@ -704,6 +704,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"

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 }}
 

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.