Merge "Add cinder auth config to nova-cell nova.conf.j2"
This commit is contained in:
commit
e53dae8eff
@ -106,6 +106,13 @@ num_retries = 3
|
|||||||
[cinder]
|
[cinder]
|
||||||
catalog_info = volumev3:cinderv3:internalURL
|
catalog_info = volumev3:cinderv3:internalURL
|
||||||
os_region_name = {{ openstack_region_name }}
|
os_region_name = {{ openstack_region_name }}
|
||||||
|
auth_url = {{ keystone_admin_url }}
|
||||||
|
auth_type = password
|
||||||
|
project_domain_name = {{ default_project_domain_name }}
|
||||||
|
user_domain_id = {{ default_user_domain_id }}
|
||||||
|
project_name = service
|
||||||
|
username = {{ cinder_keystone_user }}
|
||||||
|
password = {{ cinder_keystone_password }}
|
||||||
cafile = {{ openstack_cacert }}
|
cafile = {{ openstack_cacert }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes an issue during deleting evacuated instances
|
||||||
|
with encrypted block devices.
|
||||||
|
`LP#1891462 <https://launchpad.net/bugs/1891462>`__
|
Loading…
x
Reference in New Issue
Block a user