Support more Glance parmaeters
Change-Id: I1237cd3ce7490d4027e539ec0551ead0939dbb98
This commit is contained in:
parent
defeaf5370
commit
e63efab415
|
@ -29,6 +29,24 @@
|
|||
# (optional) http/https timeout value for glance operations.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*allowed_direct_url_schemes*]
|
||||
# (optional) A list of url schemes that can be downloaded directly via
|
||||
# direct_url.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*verify_glance_signatures*]
|
||||
# (optional) Enable image signature verification.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*glance_catalog_info*]
|
||||
# (optional) Info to match when looking for glance in the service catalog.
|
||||
# Only used if glance_api_servers are not provided.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*glance_core_properties*]
|
||||
# (optional) Default core properties of image
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# === Author(s)
|
||||
#
|
||||
# Emilien Macchi <emilien.macchi@enovance.com>
|
||||
|
@ -55,6 +73,10 @@ class cinder::glance (
|
|||
$glance_api_insecure = $::os_service_default,
|
||||
$glance_api_ssl_compression = $::os_service_default,
|
||||
$glance_request_timeout = $::os_service_default,
|
||||
$allowed_direct_url_schemes = $::os_service_default,
|
||||
$verify_glance_signatures = $::os_service_default,
|
||||
$glance_catalog_info = $::os_service_default,
|
||||
$glance_core_properties = $::os_service_default,
|
||||
) {
|
||||
|
||||
include cinder::deps
|
||||
|
@ -65,6 +87,10 @@ class cinder::glance (
|
|||
'DEFAULT/glance_api_insecure': value => $glance_api_insecure;
|
||||
'DEFAULT/glance_api_ssl_compression': value => $glance_api_ssl_compression;
|
||||
'DEFAULT/glance_request_timeout': value => $glance_request_timeout;
|
||||
'DEFAULT/allowed_direct_url_schemes': value => join(any2array($allowed_direct_url_schemes), ',');
|
||||
'DEFAULT/verify_glance_signatures': value => $verify_glance_signatures;
|
||||
'DEFAULT/glance_catalog_info': value => $glance_catalog_info;
|
||||
'DEFAULT/glance_core_properties': value => join(any2array($glance_core_properties), ',');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
The following parameters have been added to the ``cinder::glance`` class.
|
||||
|
||||
- ``allowed_direct_url_schemes``
|
||||
- ``verify_glance_signatures``
|
||||
- ``glance_catalog_info``
|
||||
- ``glance_core_properties``
|
|
@ -32,6 +32,10 @@ describe 'cinder::glance' do
|
|||
is_expected.to contain_cinder_config('DEFAULT/glance_api_insecure').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_api_ssl_compression').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_request_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('DEFAULT/allowed_direct_url_schemes').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('DEFAULT/verify_glance_signatures').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_catalog_info').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_core_properties').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -43,6 +47,10 @@ describe 'cinder::glance' do
|
|||
:glance_api_insecure => false,
|
||||
:glance_api_ssl_compression => false,
|
||||
:glance_request_timeout => 300,
|
||||
:allowed_direct_url_schemes => 'file',
|
||||
:verify_glance_signatures => true,
|
||||
:glance_catalog_info => 'image:glance:publicURL',
|
||||
:glance_core_properties => 'checksum',
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -52,18 +60,26 @@ describe 'cinder::glance' do
|
|||
is_expected.to contain_cinder_config('DEFAULT/glance_api_insecure').with_value(false)
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_api_ssl_compression').with_value(false)
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_request_timeout').with_value(300)
|
||||
is_expected.to contain_cinder_config('DEFAULT/allowed_direct_url_schemes').with_value('file')
|
||||
is_expected.to contain_cinder_config('DEFAULT/verify_glance_signatures').with_value(true)
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_catalog_info').with_value('image:glance:publicURL')
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_core_properties').with_value('checksum')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with parameters in array' do
|
||||
let :params do
|
||||
{
|
||||
:glance_api_servers => ['10.0.0.1:9292','10.0.0.2:9292'],
|
||||
:glance_api_servers => ['10.0.0.1:9292','10.0.0.2:9292'],
|
||||
:allowed_direct_url_schemes => [ 'file', 'cinder'],
|
||||
:glance_core_properties => ['checksum', 'container_format'],
|
||||
}
|
||||
end
|
||||
|
||||
it 'should configure parameters in comma-separated list' do
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_api_servers').with_value('10.0.0.1:9292,10.0.0.2:9292')
|
||||
is_expected.to contain_cinder_config('DEFAULT/allowed_direct_url_schemes').with_value('file,cinder')
|
||||
is_expected.to contain_cinder_config('DEFAULT/glance_core_properties').with_value('checksum,container_format')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue