openstack/puppet-glance
Code Issues Proposed changes

Update [glance_store] section in glance config for Juno

Browse Source 
Use new parameters for Juno like it's documented here:
http://docs.openstack.org/trunk/config-reference/content/glance-conf-changes-master.html
* Use [glance_store] section
* Update prefix when needed

Partial-Bug: #1391099

Change-Id: I096b16c33c493270422113e0107a100f967debc6
This commit is contained in:
Emilien Macchi
2014-10-28 17:37:46 -04:00
parent a03acf54bf
commit 908a62b2b9
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@@ -289,11 +289,11 @@ class glance::api(
# known_stores config
if $known_stores {
glance_api_config {
'DEFAULT/known_stores': value => join($known_stores, ',');
'glance_store/stores': value => join($known_stores, ',');
}
} else {
glance_api_config {
'DEFAULT/known_stores': ensure => absent;
'glance_store/stores': ensure => absent;
}
}

2
manifests/backend/cinder.pp
View File

@@ -71,7 +71,7 @@ class glance::backend::cinder(
'DEFAULT/cinder_api_insecure': value => $cinder_api_insecure;
'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info;
'DEFAULT/cinder_http_retries': value => $cinder_http_retries;
'DEFAULT/default_store': value => 'cinder';
'glance_store/default_store': value => 'cinder';
}
glance_cache_config {

6
manifests/backend/file.pp
View File

@@ -9,11 +9,11 @@ class glance::backend::file(
) inherits glance::api {
glance_api_config {
'DEFAULT/default_store': value => 'file';
'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
'glance_store/default_store': value => 'file';
'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
}
glance_cache_config {
'DEFAULT/filesystem_store_datadir': value => $filesystem_store_datadir;
'glance_store/filesystem_store_datadir': value => $filesystem_store_datadir;
}
}

2
manifests/backend/rbd.pp
View File

@@ -34,11 +34,11 @@ class glance::backend::rbd(
}
glance_api_config {
'DEFAULT/default_store': value => 'rbd';
'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';
}
package { 'python-ceph':

22
manifests/backend/swift.pp
View File

@@ -26,12 +26,12 @@ class glance::backend::swift(
) {
glance_api_config {
'DEFAULT/default_store': value => 'swift';
'DEFAULT/swift_store_user': value => $swift_store_user;
'DEFAULT/swift_store_key': value => $swift_store_key;
'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'glance_store/default_store': value => 'swift';
'glance_store/swift_store_user': value => $swift_store_user;
'glance_store/swift_store_key': value => $swift_store_key;
'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'DEFAULT/swift_store_create_container_on_put':
value => $swift_store_create_container_on_put;
'DEFAULT/swift_store_large_object_size':
@@ -39,11 +39,11 @@ class glance::backend::swift(
}
glance_cache_config {
'DEFAULT/swift_store_user': value => $swift_store_user;
'DEFAULT/swift_store_key': value => $swift_store_key;
'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'glance_store/swift_store_user': value => $swift_store_user;
'glance_store/swift_store_key': value => $swift_store_key;
'glance_store/swift_store_auth_address': value => $swift_store_auth_address;
'DEFAULT/swift_store_container': value => $swift_store_container;
'DEFAULT/swift_store_auth_version': value => $swift_store_auth_version;
'DEFAULT/swift_store_create_container_on_put':
value => $swift_store_create_container_on_put;
'DEFAULT/swift_store_large_object_size':

4
spec/classes/glance_api_spec.rb
View File

@@ -324,7 +324,7 @@ describe 'glance::api' do
default_params
end
it { should_not contain_glance_api_config('DEFAULT/known_stores').with_value('false') }
it { should_not contain_glance_api_config('glance_store/stores').with_value('false') }
end
describe 'with known_stores override' do
@@ -334,7 +334,7 @@ describe 'glance::api' do
})
end
it { should contain_glance_api_config('DEFAULT/known_stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
it { should contain_glance_api_config('glance_store/stores').with_value("glance.store.filesystem.Store,glance.store.http.Store") }
end
describe 'with deprecated sql parameters' do

4
spec/classes/glance_backend_cinder_spec.rb
View File

@@ -31,7 +31,7 @@ describe 'glance::backend::cinder' do
context 'when default parameters' do
it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
should contain_glance_api_config('glance_store/default_store').with_value('cinder')
should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(false)
should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:publicURL')
should contain_glance_api_config('DEFAULT/cinder_http_retries').with_value('3')
@@ -58,7 +58,7 @@ describe 'glance::backend::cinder' do
}
end
it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('cinder')
should contain_glance_api_config('glance_store/default_store').with_value('cinder')
should contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(true)
should contain_glance_api_config('DEFAULT/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt')
should contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:internalURL')

10
spec/classes/glance_backend_file_spec.rb
View File

@@ -10,12 +10,12 @@ describe 'glance::backend::file' do
end
it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('file')
should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
should contain_glance_api_config('glance_store/default_store').with_value('file')
should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
end
it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/var/lib/glance/images/')
should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/var/lib/glance/images/')
end
describe 'when overriding datadir' do
@@ -24,11 +24,11 @@ describe 'glance::backend::file' do
end
it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
should contain_glance_api_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
end
it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/filesystem_store_datadir').with_value('/tmp/')
should contain_glance_cache_config('glance_store/filesystem_store_datadir').with_value('/tmp/')
end
end
end

2
spec/classes/glance_backend_rbd_spec.rb
View File

@@ -14,7 +14,7 @@ describe 'glance::backend::rbd' do
}
end
it { should contain_glance_api_config('DEFAULT/default_store').with_value('rbd') }
it { should contain_glance_api_config('glance_store/default_store').with_value('rbd') }
it { should contain_glance_api_config('DEFAULT/rbd_store_pool').with_value('images') }
it { should contain_glance_api_config('DEFAULT/rbd_store_ceph_conf').with_value('/etc/ceph/ceph.conf') }
it { should contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('8') }

18
spec/classes/glance_backend_swift_spec.rb
View File

@@ -21,22 +21,22 @@ describe 'glance::backend::swift' do
describe 'when default parameters' do
it 'configures glance-api.conf' do
should contain_glance_api_config('DEFAULT/default_store').with_value('swift')
should contain_glance_api_config('DEFAULT/swift_store_key').with_value('key')
should contain_glance_api_config('DEFAULT/swift_store_user').with_value('user')
should contain_glance_api_config('glance_store/default_store').with_value('swift')
should contain_glance_api_config('glance_store/swift_store_key').with_value('key')
should contain_glance_api_config('glance_store/swift_store_user').with_value('user')
should contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('2')
should contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('5120')
should contain_glance_api_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_api_config('DEFAULT/swift_store_container').with_value('glance')
should contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(false)
end
it 'configures glance-cache.conf' do
should contain_glance_cache_config('DEFAULT/swift_store_key').with_value('key')
should contain_glance_cache_config('DEFAULT/swift_store_user').with_value('user')
should contain_glance_cache_config('glance_store/swift_store_key').with_value('key')
should contain_glance_cache_config('glance_store/swift_store_user').with_value('user')
should contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('2')
should contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('5120')
should contain_glance_cache_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/')
should contain_glance_cache_config('DEFAULT/swift_store_container').with_value('glance')
should contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(false)
end
@@ -60,7 +60,7 @@ describe 'glance::backend::swift' do
should contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(true)
should contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('1')
should contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('100')
should contain_glance_api_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
should contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
end
it 'configures glance-cache.conf' do
@@ -68,7 +68,7 @@ describe 'glance::backend::swift' do
should contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(true)
should contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('1')
should contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('100')
should contain_glance_cache_config('DEFAULT/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
should contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/')
end
end
end