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.pp
diff --git
a/puppet/manifests/overcloud_controller.pp
b/puppet/manifests/overcloud_controller.pp
index
357e9bf
..
985b3f0
100644
(file)
--- a/
puppet/manifests/overcloud_controller.pp
+++ b/
puppet/manifests/overcloud_controller.pp
@@
-192,7
+192,7
@@
if hiera('step') >= 4 {
} 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 {