openstack/kolla-ansible
Code Issues Proposed changes

manila: add glance section in manila-share.conf

Browse Source 
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
This commit is contained in:
Kyle Dean 2021-04-21 12:00:20 +01:00 committed by Mark Goddard
parent e63d985ccb
commit 2e4f51f671
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -701,6 +701,7 @@ nova_keystone_user: "nova"
placement_keystone_user: "placement" placement_keystone_user: "placement"
murano_keystone_user: "murano" murano_keystone_user: "murano"
cinder_keystone_user: "cinder" cinder_keystone_user: "cinder"
glance_keystone_user: "glance"
# Nova fake driver and the number of fake driver per compute node # Nova fake driver and the number of fake driver per compute node
enable_nova_fake: "no" enable_nova_fake: "no"

14
ansible/roles/manila/templates/manila-share.conf.j2
View File

@ -5,6 +5,18 @@ enabled_share_backends = {{ manila_enabled_backends|map(attribute='name')|join('
default_share_type = default_share_type 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] [cinder]
auth_uri = {{ keystone_internal_url }} auth_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_admin_url }} auth_url = {{ keystone_admin_url }}
@ -14,7 +26,7 @@ user_domain_id = {{ default_user_domain_id }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
project_name = service project_name = service
username = cinder username = {{ cinder_keystone_user }}
password = {{ cinder_keystone_password }} password = {{ cinder_keystone_password }}
cafile = {{ openstack_cacert }} cafile = {{ openstack_cacert }}

5
releasenotes/notes/manila-glance-4524ed1e9d488a60.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes an issue with Manila configuration which was missing a ``[glance]``
section, preventing some drivers from operating.