Merge "Deploy Horizon with composable apache service"

2 files changed, 28 insertions, 5 deletions

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 3a6370e4..9ebfb6d5 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -240,11 +240,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