Adds horizon to pacemaker when puppet-pacemaker is enabled

Adds the horizon (httpd) service as pacemaker resource
Also adds a default for the horizon::django_session_engine [1]
which was previously unconfigured. Also adds a server-status.conf
for httpd/pacemaker [2]

[1] https://docs.djangoproject.com/en/dev/topics/http/sessions/#using-cached-sessions
[2] https://github.com/beekhof/osp-ha-deploy/blob/master/pcmk/horizon.scenario#L72

Change-Id: I320837dfecf3241355e8a3345d0ff271592da491

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 4a50623..99ec0e9 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -88,6 +88,8 @@ pacemaker::corosync::manage_fw: false
 
 # horizon
 horizon::allowed_hosts: '*'
+horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
+
 
 mysql::server::manage_config_file: true
 

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index ae5001a..d7c03f6 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -717,7 +717,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'),
@@ -1292,6 +1296,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