openstack/puppet-glance
Code Issues Proposed changes

Move rbd related options into glance_store section

Browse Source 
From Juno release, rbd related options has been move into
glance_store section.
See more info:
http://docs.openstack.org/juno/config-reference/content/section_glance-api.conf.html

Change-Id: Ibf38ee27f0ad08592dd05650c37613cee0100a7d
Closes-Bug: #1436699
This commit is contained in:
Xingchao Yu 2015-03-26 14:48:46 +08:00
parent 0eed538b35
commit 101ca5b088
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/backend/rbd.pp
View File

@ -42,11 +42,11 @@ class glance::backend::rbd(
} }
glance_api_config { glance_api_config {
'DEFAULT/rbd_store_ceph_conf': value => $rbd_store_ceph_conf; 'glance_store/default_store': value => 'rbd';
'DEFAULT/rbd_store_user': value => $rbd_store_user; 'glance_store/rbd_store_ceph_conf': value => $rbd_store_ceph_conf;
'DEFAULT/rbd_store_pool': value => $rbd_store_pool; 'glance_store/rbd_store_user': value => $rbd_store_user;
'DEFAULT/rbd_store_chunk_size': value => $rbd_store_chunk_size; 'glance_store/rbd_store_pool': value => $rbd_store_pool;
'glance_store/default_store': value => 'rbd'; 'glance_store/rbd_store_chunk_size': value => $rbd_store_chunk_size;
} }
package { 'python-ceph': package { 'python-ceph':

10
spec/classes/glance_backend_rbd_spec.rb
View File

@ -15,9 +15,9 @@ describe 'glance::backend::rbd' do
end end
it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('rbd') } it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('rbd') }
it { is_expected.to contain_glance_api_config('DEFAULT/rbd_store_pool').with_value('images') } it { is_expected.to contain_glance_api_config('glance_store/rbd_store_pool').with_value('images') }
it { is_expected.to contain_glance_api_config('DEFAULT/rbd_store_ceph_conf').with_value('/etc/ceph/ceph.conf') } it { is_expected.to contain_glance_api_config('glance_store/rbd_store_ceph_conf').with_value('/etc/ceph/ceph.conf') }
it { is_expected.to contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('8') } it { is_expected.to contain_glance_api_config('glance_store/rbd_store_chunk_size').with_value('8') }
it { is_expected.to contain_package('python-ceph').with( it { is_expected.to contain_package('python-ceph').with(
:name => 'python-ceph', :name => 'python-ceph',
@ -34,8 +34,8 @@ describe 'glance::backend::rbd' do
:package_ensure => 'latest', :package_ensure => 'latest',
} }
end end
it { is_expected.to contain_glance_api_config('DEFAULT/rbd_store_user').with_value('user') } it { is_expected.to contain_glance_api_config('glance_store/rbd_store_user').with_value('user') }
it { is_expected.to contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('2') } it { is_expected.to contain_glance_api_config('glance_store/rbd_store_chunk_size').with_value('2') }
it { is_expected.to contain_package('python-ceph').with( it { is_expected.to contain_package('python-ceph').with(
:name => 'python-ceph', :name => 'python-ceph',
:ensure => 'latest' :ensure => 'latest'