Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Restore the NtpServer parameter name"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_controller_pacemaker.pp
diff --git
a/puppet/manifests/overcloud_controller_pacemaker.pp
b/puppet/manifests/overcloud_controller_pacemaker.pp
index
7205002
..
a0a7bb2
100644
(file)
--- a/
puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/
puppet/manifests/overcloud_controller_pacemaker.pp
@@
-22,9
+22,7
@@
Pcmk_resource <| |> {
Service <|
tag == 'aodh-service' or
tag == 'ceilometer-service' or
Service <|
tag == 'aodh-service' or
tag == 'ceilometer-service' or
- tag == 'gnocchi-service' or
- tag == 'neutron-service' or
- tag == 'nova-service'
+ tag == 'gnocchi-service'
|> {
hasrestart => true,
restart => '/bin/true',
|> {
hasrestart => true,
restart => '/bin/true',
@@
-53,10
+51,6
@@
$non_pcmk_start = hiera('step') >= 5
if hiera('step') >= 1 {
if hiera('step') >= 1 {
- create_resources(kmod::load, hiera('kernel_modules'), {})
- create_resources(sysctl::value, hiera('sysctl_settings'), {})
- Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
-
$pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {
$pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {
@@
-398,7
+392,7
@@
MYSQL_HOST=localhost\n",
} else {
$_profile_support = 'None'
}
} else {
$_profile_support = 'None'
}
- $neutron_options =
{'profile_support' => $_profile_support }
+ $neutron_options =
merge({'profile_support' => $_profile_support },hiera('horizon::neutron_options',undef))
$memcached_ipv6 = hiera('memcached_ipv6', false)
if $memcached_ipv6 {
$memcached_ipv6 = hiera('memcached_ipv6', false)
if $memcached_ipv6 {