From 1d38b753672cbd41e24a092c26d7aa5f5e0e69c3 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 20 Jul 2016 16:17:05 -0400
Subject: Deploy Horizon with composable apache service

Deploy Horizon with composable apache service and don't include:
::tripleo::profile::pacemaker::apache

Because it's already included in the profiles in puppet-tripleo.

Change-Id: I5382d5cc95ba10805019142a9a223dbd4a4b8074
Depends-On: Id28c618133e53e28dfac7e3e9cf9f5f5a6b2421a
---
 environments/puppet-pacemaker.yaml                 |  1 +
 puppet/manifests/overcloud_controller_pacemaker.pp |  5 ----
 puppet/services/pacemaker/horizon.yaml             | 28 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 puppet/services/pacemaker/horizon.yaml

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 6116dee6..8674e009 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -50,3 +50,4 @@ resource_registry:
   OS::TripleO::Services::GnocchiMetricd: ../puppet/services/pacemaker/gnocchi-metricd.yaml
   OS::TripleO::Services::GnocchiStatsd: ../puppet/services/pacemaker/gnocchi-statsd.yaml
   OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml
+  OS::TripleO::Services::Horizon: ../puppet/services/pacemaker/horizon.yaml
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 17b64cb2..276c2daa 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -245,11 +245,6 @@ if hiera('step') >= 5 {
                   Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
     }
 
-    # The next step is to include this class in puppet-tripleo profiles directly.
-    # We couldn't do it directly in puppet-tripleo, otherwise CI would have break because
-    # of Puppet duplicated resource.
-    include ::tripleo::profile::pacemaker::apache
-
     #VSM
     if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
       pacemaker::resource::ocf { 'vsm-p' :
diff --git a/puppet/services/pacemaker/horizon.yaml b/puppet/services/pacemaker/horizon.yaml
new file mode 100644
index 00000000..ea76896e
--- /dev/null
+++ b/puppet/services/pacemaker/horizon.yaml
@@ -0,0 +1,28 @@
+heat_template_version: 2016-04-08
+
+description: >
+  Horizon service with Pacemaker configured with Puppet.
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+
+  HorizonBase:
+    type: ../horizon.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Horizon role.
+    value:
+      config_settings:
+        get_attr: [HorizonBase, role_data, config_settings]
+      step_config: |
+        include ::tripleo::profile::base::horizon
+        include ::tripleo::profile::pacemaker::apache
-- 
cgit 1.2.3-korg