Prevent keystone eventlet from starting
On debian based hosts, when a package is installed, the packager
has the service automatically start. This causes a problem,
especially in CI, where the eventlet doesnt quit fast enough
and apache is started but cant bind to port.
Change-Id: I6b07a70f0729639f12ebc19f9d3cd405d8be214b
Closes-Bug: 1569390
(cherry picked from commit a90175e620
)
This commit is contained in:
parent
3c4b7aeab0
commit
78ef8e9ad4
|
@ -495,6 +495,11 @@
|
|||
# (optional) Specify the keystone system group to be used with keystone-manage.
|
||||
# Defaults to 'keystone'
|
||||
#
|
||||
# [*manage_policyrcd*]
|
||||
# (optional) Whether to manage the policy-rc.d on debian based systems to
|
||||
# prevent keystone eventlet from auto-starting on package install.
|
||||
# Defaults to false
|
||||
#
|
||||
# == Dependencies
|
||||
# None
|
||||
#
|
||||
|
@ -620,6 +625,7 @@ class keystone(
|
|||
$domain_config_directory = '/etc/keystone/domains',
|
||||
$keystone_user = $::keystone::params::keystone_user,
|
||||
$keystone_group = $::keystone::params::keystone_group,
|
||||
$manage_policyrcd = false,
|
||||
# DEPRECATED PARAMETERS
|
||||
$admin_workers = max($::processorcount, 2),
|
||||
$public_workers = max($::processorcount, 2),
|
||||
|
@ -853,6 +859,12 @@ class keystone(
|
|||
'eventlet_server/public_workers': value => $public_workers;
|
||||
}
|
||||
|
||||
if $manage_policyrcd {
|
||||
# openstacklib::policyrcd only affects debian based systems.
|
||||
class { '::openstacklib::policyrcd': services => ['keystone'] }
|
||||
Class['::openstacklib::policyrcd'] -> Package['keystone']
|
||||
}
|
||||
|
||||
if $manage_service {
|
||||
if $enabled {
|
||||
$service_ensure = 'running'
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
features:
|
||||
- Provides bool to determine if policy-rc.d should be managed
|
||||
for keystone eventlet service.
|
||||
issues:
|
||||
- Keystone eventlet service is auto-started on debian based
|
||||
systems on package install.
|
Loading…
Reference in New Issue