Merge "Allow neutron_options customization for dashboard" into stable/mitaka
This commit is contained in:
commit
62addb4c41
@ -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 {
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user