openstack/puppet-trove
Code Issues Proposed changes

Add endpoint_type options

Browse Source 
Add trove::nova_compute_endpoint_type, trove::neutron_endpoint_type,
trove::glance_endpoint_type, trove::cinder_endpoint_type,
trove::swift_endpoint_type, trove::trove_endpoint_type options to
configure endpoint type to use when searching catalog.

Change-Id: Iba9d4033d4b5267c4b2a326499364ac44d89400a
This commit is contained in:
ZhongShengping
2018-01-17 15:00:08 +08:00
parent d33c0265c9
commit 0763133219
6 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api.pp
View File

@@ -268,6 +268,16 @@ the future release. Please use trove::api::package_ensure instead.")
'DEFAULT/swift_service_type': value => $::trove::swift_service_type; 'DEFAULT/swift_service_type': value => $::trove::swift_service_type;
} }
# endpoint type
trove_config {
'DEFAULT/nova_compute_endpoint_type': value => $::trove::nova_compute_endpoint_type;
'DEFAULT/cinder_endpoint_type': value => $::trove::cinder_endpoint_type;
'DEFAULT/neutron_endpoint_type': value => $::trove::neutron_endpoint_type;
'DEFAULT/swift_endpoint_type': value => $::trove::swift_endpoint_type;
'DEFAULT/glance_endpoint_type': value => $::trove::glance_endpoint_type;
'DEFAULT/trove_endpoint_type': value => $::trove::trove_endpoint_type;
}
if $::trove::use_neutron { if $::trove::use_neutron {
trove_config { trove_config {
'DEFAULT/network_label_regex': value => '.*'; 'DEFAULT/network_label_regex': value => '.*';

30
manifests/init.pp
View File

@@ -244,6 +244,30 @@
# (optional) Neutron service type to use when searching catalog. # (optional) Neutron service type to use when searching catalog.
# Defaults to 'network'. # Defaults to 'network'.
# #
# [*nova_compute_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*neutron_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*cinder_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*swift_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*glance_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*trove_endpoint_type*]
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*use_neutron*] # [*use_neutron*]
# (optional) Use Neutron # (optional) Use Neutron
# Defaults to true # Defaults to true
@@ -351,6 +375,12 @@ class trove(
$cinder_service_type = 'volumev2', $cinder_service_type = 'volumev2',
$swift_service_type = 'object-store', $swift_service_type = 'object-store',
$neutron_service_type = 'network', $neutron_service_type = 'network',
$nova_compute_endpoint_type = $::os_service_default,
$cinder_endpoint_type = $::os_service_default,
$swift_endpoint_type = $::os_service_default,
$glance_endpoint_type = $::os_service_default,
$trove_endpoint_type = $::os_service_default,
$neutron_endpoint_type = $::os_service_default,
$use_neutron = true, $use_neutron = true,
$default_neutron_networks = $::os_service_default, $default_neutron_networks = $::os_service_default,
$package_ensure = 'present', $package_ensure = 'present',

10
manifests/taskmanager.pp
View File

@@ -175,6 +175,16 @@ the future release. Please use trove::default_neutron_networks instead.")
'DEFAULT/swift_service_type': value => $::trove::swift_service_type; 'DEFAULT/swift_service_type': value => $::trove::swift_service_type;
} }
# endpoint type
trove_taskmanager_config {
'DEFAULT/nova_compute_endpoint_type': value => $::trove::nova_compute_endpoint_type;
'DEFAULT/cinder_endpoint_type': value => $::trove::cinder_endpoint_type;
'DEFAULT/neutron_endpoint_type': value => $::trove::neutron_endpoint_type;
'DEFAULT/swift_endpoint_type': value => $::trove::swift_endpoint_type;
'DEFAULT/glance_endpoint_type': value => $::trove::glance_endpoint_type;
'DEFAULT/trove_endpoint_type': value => $::trove::trove_endpoint_type;
}
if $::trove::single_tenant_mode { if $::trove::single_tenant_mode {
trove_taskmanager_config { trove_taskmanager_config {
'DEFAULT/remote_nova_client': value => 'trove.common.single_tenant_remote.nova_client_trove_admin'; 'DEFAULT/remote_nova_client': value => 'trove.common.single_tenant_remote.nova_client_trove_admin';

6
releasenotes/notes/add_endpoint_type-92489bc41571f213.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
features:
- Add trove::nova_compute_endpoint_type, trove::neutron_endpoint_type,
trove::glance_endpoint_type, trove::cinder_endpoint_type,
trove::swift_endpoint_type, trove::trove_endpoint_type options to
configure endpoint type to use when searching catalog.

25
spec/classes/trove_api_spec.rb
View File

@@ -31,12 +31,19 @@ describe 'trove::api' do
let :pre_condition do let :pre_condition do
"class { 'trove': "class { 'trove':
nova_proxy_admin_pass => 'verysecrete', nova_proxy_admin_pass => 'verysecrete',
os_region_name => 'RegionOne', os_region_name => 'RegionOne',
nova_compute_service_type => 'compute', nova_compute_service_type => 'compute',
cinder_service_type => 'volume', cinder_service_type => 'volume',
swift_service_type => 'object-store', swift_service_type => 'object-store',
neutron_service_type => 'network'} neutron_service_type => 'network',
nova_compute_endpoint_type => '<SERVICE DEFAULT>',
cinder_endpoint_type => '<SERVICE DEFAULT>',
swift_endpoint_type => '<SERVICE DEFAULT>',
trove_endpoint_type => '<SERVICE DEFAULT>',
glance_endpoint_type => '<SERVICE DEFAULT>',
neutron_endpoint_type => '<SERVICE DEFAULT>',
}
class { '::trove::keystone::authtoken': class { '::trove::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
}" }"
@@ -72,6 +79,12 @@ describe 'trove::api' do
is_expected.to contain_trove_config('DEFAULT/cinder_service_type').with_value('volume') 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/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/neutron_service_type').with_value('network')
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>')
is_expected.to contain_trove_config('DEFAULT/trove_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/neutron_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/glance_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_config('DEFAULT/http_get_rate').with_value('200') is_expected.to contain_trove_config('DEFAULT/http_get_rate').with_value('200')
is_expected.to contain_trove_config('DEFAULT/http_post_rate').with_value('200') is_expected.to contain_trove_config('DEFAULT/http_post_rate').with_value('200')
is_expected.to contain_trove_config('DEFAULT/http_put_rate').with_value('200') is_expected.to contain_trove_config('DEFAULT/http_put_rate').with_value('200')

25
spec/classes/trove_taskmanager_spec.rb
View File

@@ -27,12 +27,19 @@ describe 'trove::taskmanager' do
let :pre_condition do let :pre_condition do
"class { 'trove': "class { 'trove':
nova_proxy_admin_pass => 'verysecrete', nova_proxy_admin_pass => 'verysecrete',
os_region_name => 'RegionOne', os_region_name => 'RegionOne',
nova_compute_service_type => 'compute', nova_compute_service_type => 'compute',
cinder_service_type => 'volume', cinder_service_type => 'volume',
swift_service_type => 'object-store', swift_service_type => 'object-store',
neutron_service_type => 'network'}" neutron_service_type => 'network',
nova_compute_endpoint_type => '<SERVICE DEFAULT>',
cinder_endpoint_type => '<SERVICE DEFAULT>',
swift_endpoint_type => '<SERVICE DEFAULT>',
trove_endpoint_type => '<SERVICE DEFAULT>',
glance_endpoint_type => '<SERVICE DEFAULT>',
neutron_endpoint_type => '<SERVICE DEFAULT>',
}"
end end
it 'installs trove-taskmanager package and service' do it 'installs trove-taskmanager package and service' do
@@ -59,6 +66,12 @@ 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/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/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/neutron_service_type').with_value('network')
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>')
is_expected.to contain_trove_taskmanager_config('DEFAULT/trove_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_taskmanager_config('DEFAULT/neutron_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_taskmanager_config('DEFAULT/glance_endpoint_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_taskmanager_config('DEFAULT/taskmanager_manager').with_value('trove.taskmanager.manager.Manager') is_expected.to contain_trove_taskmanager_config('DEFAULT/taskmanager_manager').with_value('trove.taskmanager.manager.Manager')
is_expected.to contain_file('/etc/trove/trove-guestagent.conf') is_expected.to contain_file('/etc/trove/trove-guestagent.conf')
is_expected.to contain_trove_taskmanager_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>') is_expected.to contain_trove_taskmanager_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')