openstack/puppet-trove
Code Issues Proposed changes

Merge "Make taskmanager_queue option configurable"

Browse Source
This commit is contained in:
Jenkins
2015-08-14 13:05:02 +00:00
committed by Gerrit Code Review
parent 2b91b85c51 37b81a2150
commit 4a34620aa7
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/taskmanager.pp
View File

@@ -70,10 +70,15 @@
# [*guestagent_config_file*]
# (optional) Trove guest agent configuration file.
# Defaults to '/etc/trove/trove-guestmanager.conf'.
#
# [*default_neutron_networks*]
# (optional) The network that trove will attach by default.
# Defaults to undef.
#
# [*taskmanager_queue*]
# (optional) Message queue name the Taskmanager will listen to.
# Defaults to 'taskmanager'.
#
class trove::taskmanager(
$enabled = true,
$manage_service = true,
@@ -87,7 +92,8 @@ class trove::taskmanager(
$heat_url = false,
$ensure_package = 'present',
$guestagent_config_file = '/etc/trove/trove-guestmanager.conf',
$default_neutron_networks = undef
$default_neutron_networks = undef,
$taskmanager_queue = 'taskmanager',
) inherits trove {
include ::trove::params
@@ -124,6 +130,10 @@ class trove::taskmanager(
'DEFAULT/rpc_backend': value => $::trove::rpc_backend;
}
trove_config {
'DEFAULT/taskmanager_queue': value => $taskmanager_queue;
}
# region name
if $::trove::os_region_name {
trove_taskmanager_config { 'DEFAULT/os_region_name': value => $::trove::os_region_name }
@@ -242,10 +252,6 @@ class trove::taskmanager(
}
}
trove_config {
'DEFAULT/taskmanager_queue': value => 'taskmanager';
}
# Logging
if $log_file {
trove_taskmanager_config {

1
spec/classes/trove_taskmanager_spec.rb
View File

@@ -64,6 +64,7 @@ describe 'trove::taskmanager' do
is_expected.to contain_trove_taskmanager_config('DEFAULT/swift_service_type').with_value('object-store')
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')
end
context 'when using a single RabbitMQ server' do