Debian: Allow keystone without httpd
Debian provides the keystone service using uwsgi, which does not require httpd. Change-Id: I7897f4681b95cd047fa5f6d20a9a78c9a5879783 (cherry picked from commitb634ad3eea
) (cherry picked from commitcf6b06dba2
)
This commit is contained in:
parent
62fee11058
commit
eec7bf4891
|
@ -419,12 +419,13 @@ class keystone(
|
||||||
|
|
||||||
if $manage_policyrcd {
|
if $manage_policyrcd {
|
||||||
# openstacklib policy_rcd only affects debian based systems.
|
# openstacklib policy_rcd only affects debian based systems.
|
||||||
Policy_rcd <| title == 'keystone' |> -> Package['keystone']
|
|
||||||
Policy_rcd['apache2'] -> Package['httpd']
|
|
||||||
if ($facts['os']['name'] == 'Ubuntu') {
|
if ($facts['os']['name'] == 'Ubuntu') {
|
||||||
$policy_services = 'apache2'
|
$policy_services = 'apache2'
|
||||||
|
Policy_rcd['apache2'] -> Package['httpd']
|
||||||
} else {
|
} else {
|
||||||
$policy_services = ['keystone', 'apache2']
|
$policy_services = ['keystone', 'apache2']
|
||||||
|
Policy_rcd['keystone'] -> Package['keystone']
|
||||||
|
Policy_rcd['apache2'] -> Package<| title == 'httpd' |>
|
||||||
}
|
}
|
||||||
ensure_resource('policy_rcd', $policy_services, { ensure => present, 'set_code' => '101' })
|
ensure_resource('policy_rcd', $policy_services, { ensure => present, 'set_code' => '101' })
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue