Merge "Deploy Horizon with composable apache service"
This commit is contained in:
commit
60b83ae436
|
@ -50,3 +50,4 @@ resource_registry:
|
||||||
OS::TripleO::Services::GnocchiMetricd: ../puppet/services/pacemaker/gnocchi-metricd.yaml
|
OS::TripleO::Services::GnocchiMetricd: ../puppet/services/pacemaker/gnocchi-metricd.yaml
|
||||||
OS::TripleO::Services::GnocchiStatsd: ../puppet/services/pacemaker/gnocchi-statsd.yaml
|
OS::TripleO::Services::GnocchiStatsd: ../puppet/services/pacemaker/gnocchi-statsd.yaml
|
||||||
OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml
|
OS::TripleO::Services::MySQL: ../puppet/services/pacemaker/database/mysql.yaml
|
||||||
|
OS::TripleO::Services::Horizon: ../puppet/services/pacemaker/horizon.yaml
|
||||||
|
|
|
@ -240,11 +240,6 @@ if hiera('step') >= 5 {
|
||||||
Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
|
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
|
#VSM
|
||||||
if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
|
if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
|
||||||
pacemaker::resource::ocf { 'vsm-p' :
|
pacemaker::resource::ocf { 'vsm-p' :
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue