summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-05 13:11:43 +0000
committerGerrit Code Review <review@openstack.org>2015-05-05 13:11:43 +0000
commit4e4c40376082197822d9cd64c09bee6cadf8067c (patch)
treeb22e2c9ec769a90d32e5814181edd1b7f01640a2 /puppet/manifests
parent48c3627baae7a061b22f273c3d55151577085895 (diff)
parentcf4d918cd923c228d37fc06ecadf2f48c80ef400 (diff)
Merge "puppet: install Horizon on overcloud-controller"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index d78f2d07..7628f0a6 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -472,6 +472,13 @@ if hiera('step') >= 3 {
include ::heat::api_cloudwatch
include ::heat::engine
+ # Horizon
+ $vhost_params = { add_listen => false }
+ class { 'horizon':
+ cache_server_ip => split(hiera('memcache_node_ips', '127.0.0.1'), ','),
+ vhost_extra_params => $vhost_params,
+ }
+
$snmpd_user = hiera('snmpd_readonly_user_name')
snmp::snmpv3_user { $snmpd_user:
authtype => 'MD5',