From e51d4bc8c8262fdc954b80f84ed4af1a6f9c6628 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 9 Feb 2022 09:10:47 +0200 Subject: [PATCH] Rename RBD cinder backend RBD seems to be reserved name in cinder. Once it's used as volume type, cinder fails with [1] We rename backend name in doc and AIO to workaround the issue [1] https://paste.opendev.org/show/bAJR9YEYA1hRjCuMc6kU/ Closes-Bug: #1877421 Change-Id: If48096a7309c7140cd9c182d5d3175e8d827cbd6 --- etc/openstack_deploy/user_variables.yml.prod-ceph.example | 2 +- tests/roles/bootstrap-host/tasks/prepare_ceph.yml | 2 +- tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/openstack_deploy/user_variables.yml.prod-ceph.example b/etc/openstack_deploy/user_variables.yml.prod-ceph.example index ea9cacd118..b55a98dc43 100644 --- a/etc/openstack_deploy/user_variables.yml.prod-ceph.example +++ b/etc/openstack_deploy/user_variables.yml.prod-ceph.example @@ -28,7 +28,7 @@ glance_rbd_store_pool: images nova_libvirt_images_rbd_pool: vms cinder_backends: - RBD: + rbd_volumes: volume_driver: cinder.volume.drivers.rbd.RBDDriver rbd_pool: volumes rbd_ceph_conf: /etc/ceph/ceph.conf diff --git a/tests/roles/bootstrap-host/tasks/prepare_ceph.yml b/tests/roles/bootstrap-host/tasks/prepare_ceph.yml index 3c91712900..7f999bbf7a 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_ceph.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_ceph.yml @@ -91,7 +91,7 @@ data: lv-{{ d | basename }} {% endfor %} cinder_backends: - "RBD": + "rbd_volumes": volume_driver: cinder.volume.drivers.rbd.RBDDriver rbd_pool: volumes rbd_ceph_conf: /etc/ceph/ceph.conf diff --git a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 index aed3e9bfb8..403e4902d2 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 @@ -25,7 +25,7 @@ ceph_conf_overrides_custom: mon_max_pg_per_osd: 500 openstack_config: true # Ceph ansible automatically creates pools & keys cinder_ceph_client: cinder -cinder_default_volume_type: RBD +cinder_default_volume_type: rbd_volumes glance_ceph_client: glance glance_default_store: rbd glance_rbd_store_pool: images