openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Allow libvirt rbd params to be independent of cinder

Browse Source 
Removed dependency for ``cinder_backends_rbd_inuse`` in nova.conf
when setting ``rbd_user`` and ``rbd_secret_uuid`` variables.
Cinder delivers all necessary values via RPC when attaching the
volume, so those variables are only necessary for ephemeral
disks stored in Ceph. These variables are required to be set up
on cinder-volume side under backend section.

Change-Id: If505dc58b4adb46e08230b0482d48d8898529460
Closes-Bug: #1673570
This commit is contained in:
Andrey Grebennikov 2016-12-09 17:21:53 -05:00 committed by Andrey
parent 335eb7912a
commit 402771006d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
releasenotes/notes/libvirt-rbd-independent-5876349073463cc3.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- Removed dependency for ``cinder_backends_rbd_inuse`` in nova.conf
when setting ``rbd_user`` and ``rbd_secret_uuid`` variables.
Cinder delivers all necessary values via RPC when attaching the
volume, so those variables are only necessary for ephemeral
disks stored in Ceph. These variables are required to be set up
on cinder-volume side under backend section.

6
templates/nova.conf.j2
View File

@ -264,12 +264,10 @@ cpu_mode = {{ nova_cpu_mode }}
virt_type = {{ nova_virt_type }}
remove_unused_resized_minimum_age_seconds = {{ nova_remove_unused_resized_minimum_age_seconds }}
{% if cinder_backends_rbd_inuse|bool or nova_libvirt_images_rbd_pool is defined %}
rbd_user = {{ nova_ceph_client }}
rbd_secret_uuid = {{ nova_ceph_client_uuid }}
{% endif %}
{% if nova_libvirt_images_rbd_pool is defined %}
# ceph rbd support
rbd_user = {{ nova_ceph_client }}
rbd_secret_uuid = {{ nova_ceph_client_uuid }}
images_type = rbd
images_rbd_pool = {{ nova_libvirt_images_rbd_pool }}
images_rbd_ceph_conf = /etc/ceph/ceph.conf