openstack/puppet-cinder
Code Issues Proposed changes

rbd: Stop overriding CEPH_ARGS environment

Browse Source 
This configuration is not actually needed because the rbd driver has
the specific rbd_user option to pick up the appropriate user.

Change-Id: Ie9e517845c115a2f0a45c8682c68c611c151d231
This commit is contained in:
Takashi Kajinami
2024-02-26 09:57:30 +09:00
parent 8bbd80d053
commit 94a7b021fb
2 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spec/defines/cinder_backend_rbd_spec.rb
View File

@@ -135,30 +135,6 @@ describe 'cinder::backend::rbd' do
end
end
shared_examples 'cinder::backend::rbd on Debian' do
it { is_expected.to contain_file('/etc/default/cinder-volume').with(
:ensure => 'present'
)}
it { is_expected.to contain_file_line('set initscript env rbd-ssd').with(
:line => /CEPH_ARGS=\"--id test\"/,
:path => '/etc/default/cinder-volume',
:notify => 'Anchor[cinder::service::begin]'
)}
end
shared_examples 'cinder::backend::rbd on RedHat' do
it { is_expected.to contain_file('/etc/sysconfig/openstack-cinder-volume').with(
:ensure => 'present'
)}
it { is_expected.to contain_file_line('set initscript env rbd-ssd').with(
:line => /export CEPH_ARGS=\"--id test\"/,
:path => '/etc/sysconfig/openstack-cinder-volume',
:notify => 'Anchor[cinder::service::begin]'
)}
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
@@ -168,7 +144,6 @@ describe 'cinder::backend::rbd' do
end
it_behaves_like 'cinder::backend::rbd'
it_behaves_like "cinder::backend::rbd on #{facts[:os]['family']}"
end
end
end