diff options
author | 2017-02-20 16:37:25 +0000 | |
---|---|---|
committer | 2017-02-20 16:37:26 +0000 | |
commit | 47969551159a81cd1a050c3b345892aec0bf7d96 (patch) | |
tree | 1453ebe26d4ad3d37fd809fd659ecc2afc1bc821 /manifests/profile | |
parent | cacf9e6e928940a2718b03e833d585eab6050c30 (diff) | |
parent | ec26b43d7b723f02522b9e41d3ee335566574d19 (diff) |
Merge "Allow neutron_options customization for dashboard"
Diffstat (limited to 'manifests/profile')
-rw-r--r-- | manifests/profile/base/horizon.pp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp index bd28ab0..1849435 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, } } } |