From 101ca5b088f3aec5d70c567f29dfdfa5609524ab Mon Sep 17 00:00:00 2001 From: Xingchao Yu Date: Thu, 26 Mar 2015 14:48:46 +0800 Subject: [PATCH] Move rbd related options into glance_store section 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 --- manifests/backend/rbd.pp | 10 +++++----- spec/classes/glance_backend_rbd_spec.rb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp index 903b91a8..edd83010 100644 --- a/manifests/backend/rbd.pp +++ b/manifests/backend/rbd.pp @@ -42,11 +42,11 @@ class glance::backend::rbd( } glance_api_config { - 'DEFAULT/rbd_store_ceph_conf': value => $rbd_store_ceph_conf; - 'DEFAULT/rbd_store_user': value => $rbd_store_user; - 'DEFAULT/rbd_store_pool': value => $rbd_store_pool; - 'DEFAULT/rbd_store_chunk_size': value => $rbd_store_chunk_size; - 'glance_store/default_store': value => 'rbd'; + 'glance_store/default_store': value => 'rbd'; + 'glance_store/rbd_store_ceph_conf': value => $rbd_store_ceph_conf; + 'glance_store/rbd_store_user': value => $rbd_store_user; + 'glance_store/rbd_store_pool': value => $rbd_store_pool; + 'glance_store/rbd_store_chunk_size': value => $rbd_store_chunk_size; } package { 'python-ceph': diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb index 8c649220..4ca1c18d 100644 --- a/spec/classes/glance_backend_rbd_spec.rb +++ b/spec/classes/glance_backend_rbd_spec.rb @@ -15,9 +15,9 @@ describe 'glance::backend::rbd' do end 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('DEFAULT/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_pool').with_value('images') } + 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('glance_store/rbd_store_chunk_size').with_value('8') } it { is_expected.to contain_package('python-ceph').with( :name => 'python-ceph', @@ -34,8 +34,8 @@ describe 'glance::backend::rbd' do :package_ensure => 'latest', } end - it { is_expected.to contain_glance_api_config('DEFAULT/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_user').with_value('user') } + 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( :name => 'python-ceph', :ensure => 'latest'