From a17d67766d2b27edff66b43bfe0ba03d1359eb19 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 28 Mar 2024 15:14:04 +0900 Subject: [PATCH] rbd: Purge rbd_cluster_name by default ... to avoid leaving old value. Change-Id: I4b8d9ee5330ceca602b4c090d687faff35a5b5db --- manifests/backend/rbd.pp | 2 +- spec/defines/cinder_backend_rbd_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp index a89377de..1d5b5541 100644 --- a/manifests/backend/rbd.pp +++ b/manifests/backend/rbd.pp @@ -145,7 +145,7 @@ define cinder::backend::rbd ( $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 = undef + $rbd_cluster_name_real = $facts['os_service_default'] } else { $rbd_cluster_name_real = $rbd_cluster_name } diff --git a/spec/defines/cinder_backend_rbd_spec.rb b/spec/defines/cinder_backend_rbd_spec.rb index 1e2d884d..31354fa8 100644 --- a/spec/defines/cinder_backend_rbd_spec.rb +++ b/spec/defines/cinder_backend_rbd_spec.rb @@ -37,6 +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]}/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('')