summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorDimitri Savineau <dsavinea@redhat.com>2016-11-15 14:55:06 -0500
committerDimitri Savineau <dsavinea@redhat.com>2016-11-18 12:05:15 -0500
commitec26b43d7b723f02522b9e41d3ee335566574d19 (patch)
treeda7c1a280a81d5767e695e9e7e62817ef1b61bfb /manifests/profile
parent6661cefcc4ce560318b2b4403f6fafbabf8e1853 (diff)
Allow neutron_options customization for dashboard
By default only profile_support can be configured depending of the neutron mechanism driver used (cisco_n1kv). This patch allows to add more neutron options to enable lbaas, vpnaas, etc... Change-Id: I7c040519b45b60910778f93b8ffe7a413b4cb6ae Closes-Bug: #1594388
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/horizon.pp11
1 files changed, 8 insertions, 3 deletions
diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index be07c0e..6f06456 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -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,
}
}
}