openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fixed Neutron environment file service descriptions"

This commit is contained in:
Zuul 2020-10-19 12:26:14 +00:00 committed by Gerrit Code Review
parent eaecf1bb72 5b0982a989
commit cce08b7a43
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
# A Heat environment that can be used to deploy OVN services with DVR and HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml

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

@ -1,4 +1,4 @@
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
# A Heat environment that can be used to deploy OVN services with non-DVR and HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml

8
environments/services/neutron-ovs-dvr.yaml
View File

@ -1,8 +1,8 @@
# A Heat environment file that deploys ML2/OVS in the overcloud.
# A Heat environment file that deploys ML2/OVS with DVR in the overcloud.
# Used with Compute DVR role. Note that the network configuration is
# consistent with the default tripleo network templates so some customization
# is likely required for production deployments.
resource_registry:
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.opendev.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml

8
environments/services/neutron-ovs.yaml
View File

@ -1,11 +1,5 @@
# A Heat environment file that enables DVR in the overcloud. Used with Compute
# DVR role. Note that the network configuration is consistent with the default
# tripleo network templates so some customization is likely required for
# production deployments.
# A Heat environment file that deploys ML2/OVS in the overcloud.
resource_registry:
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.opendev.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml