summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 20:59:34 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 20:59:34 +0000
commit60b83ae436cbe61514405602cd9eeb5da5ed56e1 (patch)
treee95a021cf8b6511cc8020800f804d4408a68fb6c
parent393db0231fa4b3b61b65c0ac6f031950e415d58d (diff)
parent1d38b753672cbd41e24a092c26d7aa5f5e0e69c3 (diff)
Merge "Deploy Horizon with composable apache service"
-rw-r--r--environments/puppet-pacemaker.yaml1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp5
-rw-r--r--puppet/services/pacemaker/horizon.yaml28
3 files changed, 29 insertions, 5 deletions
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 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