From 402771006d3b121e3d414c5fc664101b3c542b69 Mon Sep 17 00:00:00 2001 From: Andrey Grebennikov Date: Fri, 9 Dec 2016 17:21:53 -0500 Subject: [PATCH] Allow libvirt rbd params to be independent of cinder 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 --- .../notes/libvirt-rbd-independent-5876349073463cc3.yaml | 8 ++++++++ templates/nova.conf.j2 | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/libvirt-rbd-independent-5876349073463cc3.yaml diff --git a/releasenotes/notes/libvirt-rbd-independent-5876349073463cc3.yaml b/releasenotes/notes/libvirt-rbd-independent-5876349073463cc3.yaml new file mode 100644 index 00000000..00cc1c19 --- /dev/null +++ b/releasenotes/notes/libvirt-rbd-independent-5876349073463cc3.yaml @@ -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. diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 0fa02be6..3cdf9f99 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -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