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

diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index be07c0e..6f06456 100644 (file)
--- 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,
     }
   }
 }