summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-17 19:55:50 +0000
committerGerrit Code Review <review@openstack.org>2015-06-17 19:55:50 +0000
commit2f3116ab9f72700b572e3c8d0e8c8e37c1716633 (patch)
treecef5bbaa314b828fd6934ebf1a117677ba28eefe /puppet/manifests
parent1a9ab5080dc3dbc0bf927e18f6d90919eda9b426 (diff)
parent70a00c018a59dc0b228ec6f919cf0aa7a04b20b8 (diff)
Merge "Adds horizon to pacemaker when puppet-pacemaker is enabled"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp12
1 files changed, 11 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 1f915830..a9499821 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -716,7 +716,11 @@ if hiera('step') >= 3 {
enabled => false,
}
- # Horizon
+ # httpd/apache and horizon
+ include ::apache
+ class { '::apache::mod::status':
+ allow_from => ['127.0.0.1'],
+ }
$vhost_params = { add_listen => false }
class { 'horizon':
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
@@ -1291,6 +1295,12 @@ if hiera('step') >= 4 {
Pacemaker::Resource::Service[$::ceilometer::params::agent_notification_service_name]],
}
+ # Horizon
+ pacemaker::resource::service { $::horizon::params::http_service:
+ clone_params => "interleave=true",
+ }
+
+
}
} #END STEP 4