openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow neutron_options customization for dashboard" into stable/mitaka

This commit is contained in:
Jenkins 2016-07-07 17:52:34 +00:00 committed by Gerrit Code Review
parent 298d39990d 4ed7609557
commit 62addb4c41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/manifests/overcloud_controller.pp
View File

@ -661,7 +661,7 @@ if hiera('step') >= 3 {
} 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 {

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -1185,7 +1185,7 @@ MYSQL_HOST=localhost\n",
} 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 {