openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Move compute-instanceha, neutron-ovn-dvr-ha to deployments"

This commit is contained in:
Zuul 2019-06-01 19:28:22 +00:00 committed by Gerrit Code Review
parent c07e3a89d5 4101b35bc1
commit 176bda8f9c
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
puppet/services/pacemaker/compute-instanceha.yaml → deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml
View File

0
puppet/services/pacemaker/ovn-dbs.yaml → deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
View File

3
environments/compute-instanceha.yaml
View File

@ -4,8 +4,7 @@
# The ComputeInstanceHA *and* PacemakerRemote services need to be added
# to your Compute role
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::ComputeInstanceHA: ../puppet/services/pacemaker/compute-instanceha.yaml
OS::TripleO::Services::ComputeInstanceHA: ../deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml
parameter_defaults:
EnableInstanceHA: true

2
environments/services-baremetal/neutron-ovn-dvr-ha.yaml
View File

@ -2,7 +2,7 @@
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../../puppet/services/pacemaker/ovn-dbs.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None