From 05b0969c4d61a61a30b46fe5132f087fcab45967 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Tue, 23 Jun 2015 19:43:29 +0300 Subject: [PATCH] Fix section names for parameters Some parameters have wrong (or deprecated) section names. Change-Id: Ib44cf7825de33dc251812cb9138b821a397d77e7 --- manifests/backend/cinder.pp | 30 ++++++++-------- manifests/backend/swift.pp | 16 ++++----- manifests/backend/vsphere.pp | 20 +++++------ spec/classes/glance_backend_cinder_spec.rb | 40 ++++++++++----------- spec/classes/glance_backend_swift_spec.rb | 32 ++++++++--------- spec/classes/glance_backend_vsphere_spec.rb | 26 +++++++------- 6 files changed, 82 insertions(+), 82 deletions(-) diff --git a/manifests/backend/cinder.pp b/manifests/backend/cinder.pp index 75507d7f..7ba741bf 100644 --- a/manifests/backend/cinder.pp +++ b/manifests/backend/cinder.pp @@ -68,32 +68,32 @@ class glance::backend::cinder( } glance_api_config { - 'DEFAULT/cinder_api_insecure': value => $cinder_api_insecure; - 'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info; - 'DEFAULT/cinder_http_retries': value => $cinder_http_retries; - 'glance_store/default_store': value => 'cinder'; + 'glance_store/cinder_api_insecure': value => $cinder_api_insecure; + 'glance_store/cinder_catalog_info': value => $cinder_catalog_info; + 'glance_store/cinder_http_retries': value => $cinder_http_retries; + 'glance_store/default_store': value => 'cinder'; } glance_cache_config { - 'DEFAULT/cinder_api_insecure': value => $cinder_api_insecure; - 'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info; - 'DEFAULT/cinder_http_retries': value => $cinder_http_retries; + 'glance_store/cinder_api_insecure': value => $cinder_api_insecure; + 'glance_store/cinder_catalog_info': value => $cinder_catalog_info; + 'glance_store/cinder_http_retries': value => $cinder_http_retries; } if $cinder_endpoint_template { - glance_api_config { 'DEFAULT/cinder_endpoint_template': value => $cinder_endpoint_template; } - glance_cache_config { 'DEFAULT/cinder_endpoint_template': value => $cinder_endpoint_template; } + glance_api_config { 'glance_store/cinder_endpoint_template': value => $cinder_endpoint_template; } + glance_cache_config { 'glance_store/cinder_endpoint_template': value => $cinder_endpoint_template; } } else { - glance_api_config { 'DEFAULT/cinder_endpoint_template': ensure => absent; } - glance_cache_config { 'DEFAULT/cinder_endpoint_template': ensure => absent; } + glance_api_config { 'glance_store/cinder_endpoint_template': ensure => absent; } + glance_cache_config { 'glance_store/cinder_endpoint_template': ensure => absent; } } if $cinder_ca_certificates_file { - glance_api_config { 'DEFAULT/cinder_ca_certificates_file': value => $cinder_ca_certificates_file; } - glance_cache_config { 'DEFAULT/cinder_ca_certificates_file': value => $cinder_ca_certificates_file; } + glance_api_config { 'glance_store/cinder_ca_certificates_file': value => $cinder_ca_certificates_file; } + glance_cache_config { 'glance_store/cinder_ca_certificates_file': value => $cinder_ca_certificates_file; } } else { - glance_api_config { 'DEFAULT/cinder_ca_certificates_file': ensure => absent; } - glance_cache_config { 'DEFAULT/cinder_ca_certificates_file': ensure => absent; } + glance_api_config { 'glance_store/cinder_ca_certificates_file': ensure => absent; } + glance_cache_config { 'glance_store/cinder_ca_certificates_file': ensure => absent; } } } diff --git a/manifests/backend/swift.pp b/manifests/backend/swift.pp index 0a243597..6065acff 100644 --- a/manifests/backend/swift.pp +++ b/manifests/backend/swift.pp @@ -45,11 +45,11 @@ class glance::backend::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': + 'glance_store/swift_store_container': value => $swift_store_container; + 'glance_store/swift_store_auth_version': value => $swift_store_auth_version; + 'glance_store/swift_store_create_container_on_put': value => $swift_store_create_container_on_put; - 'DEFAULT/swift_store_large_object_size': + 'glance_store/swift_store_large_object_size': value => $swift_store_large_object_size; 'glance_store/swift_store_endpoint_type': value => $swift_store_endpoint_type; @@ -59,11 +59,11 @@ class glance::backend::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': + 'glance_store/swift_store_container': value => $swift_store_container; + 'glance_store/swift_store_auth_version': value => $swift_store_auth_version; + 'glance_store/swift_store_create_container_on_put': value => $swift_store_create_container_on_put; - 'DEFAULT/swift_store_large_object_size': + 'glance_store/swift_store_large_object_size': value => $swift_store_large_object_size; } diff --git a/manifests/backend/vsphere.pp b/manifests/backend/vsphere.pp index 133b0986..c5ad8270 100644 --- a/manifests/backend/vsphere.pp +++ b/manifests/backend/vsphere.pp @@ -69,15 +69,15 @@ class glance::backend::vsphere( $vcenter_api_retry_count = '10', ) { glance_api_config { - 'DEFAULT/default_store': value => 'vsphere'; - 'DEFAULT/vmware_api_insecure': value => $vcenter_api_insecure; - 'DEFAULT/vmware_server_host': value => $vcenter_host; - 'DEFAULT/vmware_server_username': value => $vcenter_user; - 'DEFAULT/vmware_server_password': value => $vcenter_password; - 'DEFAULT/vmware_datastore_name': value => $vcenter_datastore; - 'DEFAULT/vmware_store_image_dir': value => $vcenter_image_dir; - 'DEFAULT/vmware_task_poll_interval': value => $vcenter_task_poll_interval; - 'DEFAULT/vmware_api_retry_count': value => $vcenter_api_retry_count; - 'DEFAULT/vmware_datacenter_path': value => $vcenter_datacenter; + 'glance_store/default_store': value => 'vsphere'; + 'glance_store/vmware_api_insecure': value => $vcenter_api_insecure; + 'glance_store/vmware_server_host': value => $vcenter_host; + 'glance_store/vmware_server_username': value => $vcenter_user; + 'glance_store/vmware_server_password': value => $vcenter_password; + 'glance_store/vmware_datastore_name': value => $vcenter_datastore; + 'glance_store/vmware_store_image_dir': value => $vcenter_image_dir; + 'glance_store/vmware_task_poll_interval': value => $vcenter_task_poll_interval; + 'glance_store/vmware_api_retry_count': value => $vcenter_api_retry_count; + 'glance_store/vmware_datacenter_path': value => $vcenter_datacenter; } } diff --git a/spec/classes/glance_backend_cinder_spec.rb b/spec/classes/glance_backend_cinder_spec.rb index f961dfae..99c62686 100644 --- a/spec/classes/glance_backend_cinder_spec.rb +++ b/spec/classes/glance_backend_cinder_spec.rb @@ -32,18 +32,18 @@ describe 'glance::backend::cinder' do it 'configures glance-api.conf' do is_expected.to contain_glance_api_config('glance_store/default_store').with_value('cinder') - is_expected.to contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(false) - is_expected.to contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:publicURL') - is_expected.to contain_glance_api_config('DEFAULT/cinder_http_retries').with_value('3') - is_expected.to contain_glance_api_config('DEFAULT/cinder_ca_certificates_file').with(:ensure => 'absent') - is_expected.to contain_glance_api_config('DEFAULT/cinder_endpoint_template').with(:ensure => 'absent') + is_expected.to contain_glance_api_config('glance_store/cinder_api_insecure').with_value(false) + is_expected.to contain_glance_api_config('glance_store/cinder_catalog_info').with_value('volume:cinder:publicURL') + is_expected.to contain_glance_api_config('glance_store/cinder_http_retries').with_value('3') + is_expected.to contain_glance_api_config('glance_store/cinder_ca_certificates_file').with(:ensure => 'absent') + is_expected.to contain_glance_api_config('glance_store/cinder_endpoint_template').with(:ensure => 'absent') end it 'configures glance-cache.conf' do - is_expected.to contain_glance_cache_config('DEFAULT/cinder_api_insecure').with_value(false) - is_expected.to contain_glance_cache_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:publicURL') - is_expected.to contain_glance_cache_config('DEFAULT/cinder_http_retries').with_value('3') - is_expected.to contain_glance_cache_config('DEFAULT/cinder_ca_certificates_file').with(:ensure => 'absent') - is_expected.to contain_glance_cache_config('DEFAULT/cinder_endpoint_template').with(:ensure => 'absent') + is_expected.to contain_glance_cache_config('glance_store/cinder_api_insecure').with_value(false) + is_expected.to contain_glance_cache_config('glance_store/cinder_catalog_info').with_value('volume:cinder:publicURL') + is_expected.to contain_glance_cache_config('glance_store/cinder_http_retries').with_value('3') + is_expected.to contain_glance_cache_config('glance_store/cinder_ca_certificates_file').with(:ensure => 'absent') + is_expected.to contain_glance_cache_config('glance_store/cinder_endpoint_template').with(:ensure => 'absent') end end @@ -59,18 +59,18 @@ describe 'glance::backend::cinder' do end it 'configures glance-api.conf' do is_expected.to contain_glance_api_config('glance_store/default_store').with_value('cinder') - is_expected.to contain_glance_api_config('DEFAULT/cinder_api_insecure').with_value(true) - is_expected.to contain_glance_api_config('DEFAULT/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt') - is_expected.to contain_glance_api_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:internalURL') - is_expected.to contain_glance_api_config('DEFAULT/cinder_endpoint_template').with_value('http://srv-foo:8776/v1/%(project_id)s') - is_expected.to contain_glance_api_config('DEFAULT/cinder_http_retries').with_value('10') + is_expected.to contain_glance_api_config('glance_store/cinder_api_insecure').with_value(true) + is_expected.to contain_glance_api_config('glance_store/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt') + is_expected.to contain_glance_api_config('glance_store/cinder_catalog_info').with_value('volume:cinder:internalURL') + is_expected.to contain_glance_api_config('glance_store/cinder_endpoint_template').with_value('http://srv-foo:8776/v1/%(project_id)s') + is_expected.to contain_glance_api_config('glance_store/cinder_http_retries').with_value('10') end it 'configures glance-cache.conf' do - is_expected.to contain_glance_cache_config('DEFAULT/cinder_api_insecure').with_value(true) - is_expected.to contain_glance_cache_config('DEFAULT/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt') - is_expected.to contain_glance_cache_config('DEFAULT/cinder_catalog_info').with_value('volume:cinder:internalURL') - is_expected.to contain_glance_cache_config('DEFAULT/cinder_endpoint_template').with_value('http://srv-foo:8776/v1/%(project_id)s') - is_expected.to contain_glance_cache_config('DEFAULT/cinder_http_retries').with_value('10') + is_expected.to contain_glance_cache_config('glance_store/cinder_api_insecure').with_value(true) + is_expected.to contain_glance_cache_config('glance_store/cinder_ca_certificates_file').with_value('/etc/ssh/ca.crt') + is_expected.to contain_glance_cache_config('glance_store/cinder_catalog_info').with_value('volume:cinder:internalURL') + is_expected.to contain_glance_cache_config('glance_store/cinder_endpoint_template').with_value('http://srv-foo:8776/v1/%(project_id)s') + is_expected.to contain_glance_cache_config('glance_store/cinder_http_retries').with_value('10') end end diff --git a/spec/classes/glance_backend_swift_spec.rb b/spec/classes/glance_backend_swift_spec.rb index d9e3b221..65d09ddd 100644 --- a/spec/classes/glance_backend_swift_spec.rb +++ b/spec/classes/glance_backend_swift_spec.rb @@ -24,22 +24,22 @@ describe 'glance::backend::swift' do is_expected.to contain_glance_api_config('glance_store/default_store').with_value('swift') is_expected.to contain_glance_api_config('glance_store/swift_store_key').with_value('key') is_expected.to contain_glance_api_config('glance_store/swift_store_user').with_value('user') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('2') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('5120') + is_expected.to contain_glance_api_config('glance_store/swift_store_auth_version').with_value('2') + is_expected.to contain_glance_api_config('glance_store/swift_store_large_object_size').with_value('5120') is_expected.to contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_container').with_value('glance') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(false) + is_expected.to contain_glance_api_config('glance_store/swift_store_container').with_value('glance') + is_expected.to contain_glance_api_config('glance_store/swift_store_create_container_on_put').with_value(false) is_expected.to contain_glance_api_config('glance_store/swift_store_endpoint_type').with_value('internalURL') end it 'configures glance-cache.conf' do is_expected.to contain_glance_cache_config('glance_store/swift_store_key').with_value('key') is_expected.to contain_glance_cache_config('glance_store/swift_store_user').with_value('user') - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('2') - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('5120') + is_expected.to contain_glance_cache_config('glance_store/swift_store_auth_version').with_value('2') + is_expected.to contain_glance_cache_config('glance_store/swift_store_large_object_size').with_value('5120') is_expected.to contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.1:5000/v2.0/') - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_container').with_value('glance') - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(false) + is_expected.to contain_glance_cache_config('glance_store/swift_store_container').with_value('glance') + is_expected.to contain_glance_cache_config('glance_store/swift_store_create_container_on_put').with_value(false) end end @@ -58,19 +58,19 @@ describe 'glance::backend::swift' do end it 'configures glance-api.conf' do - is_expected.to contain_glance_api_config('DEFAULT/swift_store_container').with_value('swift') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_create_container_on_put').with_value(true) - is_expected.to contain_glance_api_config('DEFAULT/swift_store_auth_version').with_value('1') - is_expected.to contain_glance_api_config('DEFAULT/swift_store_large_object_size').with_value('100') + is_expected.to contain_glance_api_config('glance_store/swift_store_container').with_value('swift') + is_expected.to contain_glance_api_config('glance_store/swift_store_create_container_on_put').with_value(true) + is_expected.to contain_glance_api_config('glance_store/swift_store_auth_version').with_value('1') + is_expected.to contain_glance_api_config('glance_store/swift_store_large_object_size').with_value('100') is_expected.to contain_glance_api_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/') is_expected.to contain_glance_api_config('glance_store/swift_store_endpoint_type').with_value('publicURL') end it 'configures glance-cache.conf' do - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_container').with_value('swift') - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_create_container_on_put').with_value(true) - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_auth_version').with_value('1') - is_expected.to contain_glance_cache_config('DEFAULT/swift_store_large_object_size').with_value('100') + is_expected.to contain_glance_cache_config('glance_store/swift_store_container').with_value('swift') + is_expected.to contain_glance_cache_config('glance_store/swift_store_create_container_on_put').with_value(true) + is_expected.to contain_glance_cache_config('glance_store/swift_store_auth_version').with_value('1') + is_expected.to contain_glance_cache_config('glance_store/swift_store_large_object_size').with_value('100') is_expected.to contain_glance_cache_config('glance_store/swift_store_auth_address').with_value('127.0.0.2:8080/v1.0/') end end diff --git a/spec/classes/glance_backend_vsphere_spec.rb b/spec/classes/glance_backend_vsphere_spec.rb index 43ab90cf..33a5fb83 100644 --- a/spec/classes/glance_backend_vsphere_spec.rb +++ b/spec/classes/glance_backend_vsphere_spec.rb @@ -40,16 +40,16 @@ describe 'glance::backend::vsphere' do } end it 'configures glance-api.conf' do - is_expected.to contain_glance_api_config('DEFAULT/default_store').with_value('vsphere') - is_expected.to contain_glance_api_config('DEFAULT/vmware_api_insecure').with_value('False') - is_expected.to contain_glance_api_config('DEFAULT/vmware_server_host').with_value('10.0.0.1') - is_expected.to contain_glance_api_config('DEFAULT/vmware_server_username').with_value('root') - is_expected.to contain_glance_api_config('DEFAULT/vmware_server_password').with_value('123456') - is_expected.to contain_glance_api_config('DEFAULT/vmware_datastore_name').with_value('Datastore') - is_expected.to contain_glance_api_config('DEFAULT/vmware_store_image_dir').with_value('/openstack_glance') - is_expected.to contain_glance_api_config('DEFAULT/vmware_task_poll_interval').with_value('5') - is_expected.to contain_glance_api_config('DEFAULT/vmware_api_retry_count').with_value('10') - is_expected.to contain_glance_api_config('DEFAULT/vmware_datacenter_path').with_value('Datacenter') + is_expected.to contain_glance_api_config('glance_store/default_store').with_value('vsphere') + is_expected.to contain_glance_api_config('glance_store/vmware_api_insecure').with_value('False') + is_expected.to contain_glance_api_config('glance_store/vmware_server_host').with_value('10.0.0.1') + is_expected.to contain_glance_api_config('glance_store/vmware_server_username').with_value('root') + is_expected.to contain_glance_api_config('glance_store/vmware_server_password').with_value('123456') + is_expected.to contain_glance_api_config('glance_store/vmware_datastore_name').with_value('Datastore') + is_expected.to contain_glance_api_config('glance_store/vmware_store_image_dir').with_value('/openstack_glance') + is_expected.to contain_glance_api_config('glance_store/vmware_task_poll_interval').with_value('5') + is_expected.to contain_glance_api_config('glance_store/vmware_api_retry_count').with_value('10') + is_expected.to contain_glance_api_config('glance_store/vmware_datacenter_path').with_value('Datacenter') end end @@ -68,9 +68,9 @@ describe 'glance::backend::vsphere' do } end it 'configures glance-api.conf' do - is_expected.to contain_glance_api_config('DEFAULT/vmware_api_insecure').with_value('True') - is_expected.to contain_glance_api_config('DEFAULT/vmware_task_poll_interval').with_value('6') - is_expected.to contain_glance_api_config('DEFAULT/vmware_api_retry_count').with_value('11') + is_expected.to contain_glance_api_config('glance_store/vmware_api_insecure').with_value('True') + is_expected.to contain_glance_api_config('glance_store/vmware_task_poll_interval').with_value('6') + is_expected.to contain_glance_api_config('glance_store/vmware_api_retry_count').with_value('11') end end