openstack
/
puppet-trove
Code Issues Proposed changes

Merge "Add glance_service_type option"

This commit is contained in:
Zuul 2018-03-28 21:02:25 +00:00 committed by Gerrit Code Review
parent ae7290a272 0d8382175a
commit ed21e2b1f3
6 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/api.pp
View File

@ -265,6 +265,7 @@ the future release. Please use trove::api::package_ensure instead.")
'DEFAULT/nova_compute_service_type': value => $::trove::nova_compute_service_type;
'DEFAULT/cinder_service_type': value => $::trove::cinder_service_type;
'DEFAULT/neutron_service_type': value => $::trove::neutron_service_type;
'DEFAULT/glance_service_type': value => $::trove::glance_service_type;
'DEFAULT/swift_service_type': value => $::trove::swift_service_type;
}

5
manifests/init.pp
View File

@ -244,6 +244,10 @@
# (optional) Neutron service type to use when searching catalog.
# Defaults to 'network'.
#
# [*glance_service_type*]
# (optional) Glance service type to use when searching catalog.
# Defaults to 'image'.
#
# [*nova_compute_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
@ -375,6 +379,7 @@ class trove(
$cinder_service_type = 'volumev2',
$swift_service_type = 'object-store',
$neutron_service_type = 'network',
$glance_service_type = 'image',
$nova_compute_endpoint_type = $::os_service_default,
$cinder_endpoint_type = $::os_service_default,
$swift_endpoint_type = $::os_service_default,

1
manifests/taskmanager.pp
View File

@ -172,6 +172,7 @@ the future release. Please use trove::default_neutron_networks instead.")
'DEFAULT/nova_compute_service_type': value => $::trove::nova_compute_service_type;
'DEFAULT/cinder_service_type': value => $::trove::cinder_service_type;
'DEFAULT/neutron_service_type': value => $::trove::neutron_service_type;
'DEFAULT/glance_service_type': value => $::trove::glance_service_type;
'DEFAULT/swift_service_type': value => $::trove::swift_service_type;
}

4
releasenotes/notes/add_glance_service_type-option-1b62f22b9e3d3290.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add trove::glance_service_type option to configure glance
service type to use when searching catalog.

2
spec/classes/trove_api_spec.rb
View File

@ -37,6 +37,7 @@ describe 'trove::api' do
cinder_service_type => 'volume',
swift_service_type => 'object-store',
neutron_service_type => 'network',
glance_service_type => 'image',
nova_compute_endpoint_type => '<SERVICE DEFAULT>',
cinder_endpoint_type => '<SERVICE DEFAULT>',
swift_endpoint_type => '<SERVICE DEFAULT>',
@ -79,6 +80,7 @@ describe 'trove::api' do
is_expected.to contain_trove_config('DEFAULT/cinder_service_type').with_value('volume')
is_expected.to contain_trove_config('DEFAULT/swift_service_type').with_value('object-store')
is_expected.to contain_trove_config('DEFAULT/neutron_service_type').with_value('network')
is_expected.to contain_trove_config('DEFAULT/glance_service_type').with_value('image')
is_expected.to contain_trove_config('DEFAULT/nova_compute_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/cinder_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/swift_endpoint_type').with_value('<SERVICE DEFAULT>')

2
spec/classes/trove_taskmanager_spec.rb
View File

@ -33,6 +33,7 @@ describe 'trove::taskmanager' do
cinder_service_type => 'volume',
swift_service_type => 'object-store',
neutron_service_type => 'network',
glance_service_type => 'image',
nova_compute_endpoint_type => '<SERVICE DEFAULT>',
cinder_endpoint_type => '<SERVICE DEFAULT>',
swift_endpoint_type => '<SERVICE DEFAULT>',
@ -66,6 +67,7 @@ describe 'trove::taskmanager' do
is_expected.to contain_trove_taskmanager_config('DEFAULT/cinder_service_type').with_value('volume')
is_expected.to contain_trove_taskmanager_config('DEFAULT/swift_service_type').with_value('object-store')
is_expected.to contain_trove_taskmanager_config('DEFAULT/neutron_service_type').with_value('network')
is_expected.to contain_trove_taskmanager_config('DEFAULT/glance_service_type').with_value('image')
is_expected.to contain_trove_taskmanager_config('DEFAULT/nova_compute_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_taskmanager_config('DEFAULT/cinder_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_taskmanager_config('DEFAULT/swift_endpoint_type').with_value('<SERVICE DEFAULT>')