diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-network.yaml | 4 | ||||
| -rw-r--r-- | environments/services-docker/neutron-ovn.yaml | 27 |
2 files changed, 29 insertions, 2 deletions
diff --git a/environments/docker-network.yaml b/environments/docker-network.yaml index f10ec389..bd73d4b3 100644 --- a/environments/docker-network.yaml +++ b/environments/docker-network.yaml @@ -1,2 +1,2 @@ -resource_registry: - OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml +# TODO(sbaker) Remove once CI and documentation no longer use this file +resource_registry: {} diff --git a/environments/services-docker/neutron-ovn.yaml b/environments/services-docker/neutron-ovn.yaml new file mode 100644 index 00000000..8c8a56c9 --- /dev/null +++ b/environments/services-docker/neutron-ovn.yaml @@ -0,0 +1,27 @@ +# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers. +resource_registry: + OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml + OS::TripleO::Services::OVNController: ../../docker/services/ovn-controller.yaml + OS::TripleO::Services::OVNDBs: ../../docker/services/ovn-dbs.yaml +# Disabling Neutron services that overlap with OVN + OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None + + +parameter_defaults: + NeutronMechanismDrivers: ovn + OVNVifType: ovs + OVNNeutronSyncMode: log + OVNQosDriver: ovn-qos + OVNTunnelEncapType: geneve + NeutronEnableDHCPAgent: false + NeutronTypeDrivers: 'geneve,vxlan,vlan,flat' + NeutronNetworkType: 'geneve' + NeutronServicePlugins: 'qos,ovn-router' + NeutronVniRanges: ['1:65536', ] + DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest' + DockerNeutronConfigImage: 'tripleoupstream/centos-binary-neutron-server-ovn:latest' |