Disable trove-guestagent service by default
The trove-guestagent service should be run in instances instead of OpenStack hosts. This change disables the service by default because we expect these modules are used to deploy hosts, and we don't expect any use case where this puppet module is used to build the trove guest image. Closes-Bug: #1965228 Closes-Bug: #1485397 Change-Id: I57aa6ecd008f1a7a271e7baafc95cd75bf700f54
This commit is contained in:
parent
ecebc7e11c
commit
4c6e5c9d76
@ -6,7 +6,7 @@
|
||||
#
|
||||
# [*enabled*]
|
||||
# (optional) Whether to enable the trove guest agent service
|
||||
# Defaults to true
|
||||
# Defaults to false
|
||||
#
|
||||
# [*manage_service*]
|
||||
# (optional) Whether to start/stop the service
|
||||
@ -83,7 +83,7 @@
|
||||
# Defaults to undef.
|
||||
#
|
||||
class trove::guestagent(
|
||||
$enabled = true,
|
||||
$enabled = false,
|
||||
$manage_service = true,
|
||||
$package_ensure = 'present',
|
||||
$debug = $::os_service_default,
|
||||
|
@ -128,10 +128,7 @@ Please configure options directly with the trove::guestagent class using hiera."
|
||||
require => Anchor['trove::install::end'],
|
||||
}
|
||||
} else {
|
||||
class {'trove::guestagent':
|
||||
enabled => false,
|
||||
manage_service => false,
|
||||
}
|
||||
include trove::guestagent
|
||||
}
|
||||
|
||||
trove_config {
|
||||
|
@ -0,0 +1,7 @@
|
||||
---
|
||||
fixes:
|
||||
- |
|
||||
Now the ``trove-guestagent`` service is disabled by default, because this
|
||||
service should be run in instances instead of in hosts. The service can be
|
||||
still enabled by setting the ``trove::guestagent::enabled`` parameter to
|
||||
``true`` but this requires careful consideration.
|
@ -22,9 +22,9 @@ describe 'trove::guestagent' do
|
||||
it 'installs trove-guestagent package and service' do
|
||||
is_expected.to contain_service('trove-guestagent').with(
|
||||
:name => platform_params[:guestagent_service_name],
|
||||
:ensure => 'running',
|
||||
:ensure => 'stopped',
|
||||
:hasstatus => true,
|
||||
:enable => true
|
||||
:enable => false
|
||||
)
|
||||
is_expected.to contain_package('trove-guestagent').with(
|
||||
:name => platform_params[:guestagent_package_name],
|
||||
|
@ -62,10 +62,7 @@ describe 'trove::taskmanager' do
|
||||
end
|
||||
|
||||
it 'configures trove-taskmanager with trove::guestagent' do
|
||||
is_expected.to contain_class('trove::guestagent').with(
|
||||
:enabled => false,
|
||||
:manage_service => false,
|
||||
)
|
||||
is_expected.to contain_class('trove::guestagent')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user