openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Allow neutron_options customization for dashboard"

Browse Source
This commit is contained in:
Jenkins 2017-02-20 16:37:25 +00:00 committed by Gerrit Code Review
commit 4796955115
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/profile/base/horizon.pp
View File

@ -23,8 +23,13 @@
# for more details.
# Defaults to hiera('step')
#
# [*neutron_options*]
# (Optional) A hash of parameters to enable features specific to Neutron
# Defaults to hiera('horizon::neutron_options', undef)
#
class tripleo::profile::base::horizon (
$step = hiera('step'),
$step = hiera('step'),
$neutron_options = hiera('horizon::neutron_options', undef),
) {
if $step >= 4 {
# Horizon
@ -35,7 +40,7 @@ class tripleo::profile::base::horizon (
} else {
$_profile_support = 'None'
}
$neutron_options = {'profile_support' => $_profile_support }
$neutron_options_real = merge({'profile_support' => $_profile_support }, $neutron_options)
$memcached_ipv6 = hiera('memcached_ipv6', false)
if $memcached_ipv6 {
$horizon_memcached_servers = hiera('memcached_node_ips_v6', '[::1]')
@ -44,7 +49,7 @@ class tripleo::profile::base::horizon (
}
class { '::horizon':
cache_server_ip => $horizon_memcached_servers,
neutron_options => $neutron_options,
neutron_options => $neutron_options_real,
}
}
}