Skip to content

Commit cf7042c

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "manila: add glance section in manila-share.conf" into stable/wallaby
2 parents eba702c + 7ae560f commit cf7042c

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

ansible/group_vars/all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@ nova_keystone_user: "nova"
719719
placement_keystone_user: "placement"
720720
murano_keystone_user: "murano"
721721
cinder_keystone_user: "cinder"
722+
glance_keystone_user: "glance"
722723

723724
# Nova fake driver and the number of fake driver per compute node
724725
enable_nova_fake: "no"

ansible/roles/manila/templates/manila-share.conf.j2

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ enabled_share_backends = {{ manila_enabled_backends|map(attribute='name')|join('
55

66
default_share_type = default_share_type
77

8+
[glance]
9+
auth_url = {{ keystone_admin_url }}
10+
auth_type = password
11+
project_domain_id = {{ default_project_domain_id }}
12+
user_domain_id = {{ default_user_domain_id }}
13+
region_name = {{ openstack_region_name }}
14+
endpoint_type = internalURL
15+
project_name = service
16+
username = {{ glance_keystone_user }}
17+
password = {{ glance_keystone_password }}
18+
cafile = {{ openstack_cacert }}
19+
820
[cinder]
921
auth_uri = {{ keystone_internal_url }}
1022
auth_url = {{ keystone_admin_url }}
@@ -14,7 +26,7 @@ user_domain_id = {{ default_user_domain_id }}
1426
region_name = {{ openstack_region_name }}
1527
endpoint_type = internalURL
1628
project_name = service
17-
username = cinder
29+
username = {{ cinder_keystone_user }}
1830
password = {{ cinder_keystone_password }}
1931
cafile = {{ openstack_cacert }}
2032

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with Manila configuration which was missing a ``[glance]``
5+
section, preventing some drivers from operating.

0 commit comments

Comments
 (0)