openstack/puppet-trove
Code Issues Proposed changes

Merge "adding taskmanager_manager entry to define Trove taskmanager entry point"

Browse Source
This commit is contained in:
Jenkins 2016-11-04 17:23:02 +00:00 committed by Gerrit Code Review
commit 1032a9e41e
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/taskmanager.pp
View File

@ -80,6 +80,10 @@
# (optional) Message queue name the Taskmanager will listen to.
# Defaults to 'taskmanager'.
#
# [*taskmanager_manager*]
# Trove taskmanager entry point.
# Defaults to 'trove.taskmanager.manager.Manager'.
#
# DEPRECATED OPTIONS
#
# [*use_guestagent_template*]
@ -101,6 +105,7 @@ class trove::taskmanager(
$guestagent_config_file = '/etc/trove/trove-guestagent.conf',
$default_neutron_networks = undef,
$taskmanager_queue = 'taskmanager',
$taskmanager_manager = 'trove.taskmanager.manager.Manager',
#DEPRECATED OPTIONS
$use_guestagent_template = true,
) inherits trove {
@ -131,6 +136,7 @@ class trove::taskmanager(
'DEFAULT/nova_proxy_admin_user': value => $::trove::nova_proxy_admin_user;
'DEFAULT/nova_proxy_admin_pass': value => $::trove::nova_proxy_admin_pass;
'DEFAULT/nova_proxy_admin_tenant_name': value => $::trove::nova_proxy_admin_tenant_name;
'DEFAULT/taskmanager_manager': value => $taskmanager_manager;
}
trove_config {

1
spec/classes/trove_taskmanager_spec.rb
View File

@ -68,6 +68,7 @@ describe 'trove::taskmanager' do
is_expected.to contain_trove_taskmanager_config('DEFAULT/heat_service_type').with_value('orchestration')
is_expected.to contain_trove_taskmanager_config('DEFAULT/neutron_service_type').with_value('network')
is_expected.to contain_trove_config('DEFAULT/taskmanager_queue').with_value('taskmanager')
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_trove_taskmanager_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_trove_taskmanager_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>')