From bdc045dba61a2cc9b003b0ea5bf2ca1e72a04667 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 28 Mar 2024 15:17:07 +0900 Subject: [PATCH] rbd: Simplify handling of rbd_cluster_name We can accept config change unless we backport the change, because services need to be restarted anyway during upgrade. Change-Id: Ibb49c49f85f0c5bee8545e240fe3c6aac7e3d13b --- manifests/backend/rbd.pp | 8 +------- spec/defines/cinder_backend_rbd_spec.rb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp index 1d5b5541..c779841b 100644 --- a/manifests/backend/rbd.pp +++ b/manifests/backend/rbd.pp @@ -143,12 +143,6 @@ define cinder::backend::rbd ( include cinder::params $rbd_cluster_name = basename($rbd_ceph_conf, '.conf') - if $rbd_cluster_name == 'ceph' { - # Do not pass a parameter value in order to avoid service restarts - $rbd_cluster_name_real = $facts['os_service_default'] - } else { - $rbd_cluster_name_real = $rbd_cluster_name - } cinder_config { "${name}/volume_backend_name": value => $volume_backend_name; @@ -166,7 +160,7 @@ define cinder::backend::rbd ( "${name}/rados_connection_interval": value => $rados_connection_interval; "${name}/rados_connection_retries": value => $rados_connection_retries; "${name}/rbd_store_chunk_size": value => $rbd_store_chunk_size; - "${name}/rbd_cluster_name": value => $rbd_cluster_name_real; + "${name}/rbd_cluster_name": value => $rbd_cluster_name; "${name}/report_dynamic_total_capacity": value => $report_dynamic_total_capacity; "${name}/rbd_exclusive_cinder_pool": value => $rbd_exclusive_cinder_pool; "${name}/enable_deferred_deletion": value => $enable_deferred_deletion; diff --git a/spec/defines/cinder_backend_rbd_spec.rb b/spec/defines/cinder_backend_rbd_spec.rb index 31354fa8..42fec77f 100644 --- a/spec/defines/cinder_backend_rbd_spec.rb +++ b/spec/defines/cinder_backend_rbd_spec.rb @@ -37,7 +37,7 @@ describe 'cinder::backend::rbd' do is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rados_connection_interval").with_value('') is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rados_connection_retries").with_value('') is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rbd_store_chunk_size").with_value('') - is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rbd_cluster_name").with_value('') + is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rbd_cluster_name").with_value('ceph') is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/report_dynamic_total_capacity").with_value('') is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rbd_exclusive_cinder_pool").with_value('') is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/enable_deferred_deletion").with_value('')