openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Default to OVN raft clustering"

This commit is contained in:
Zuul 2022-08-03 12:30:58 +00:00 committed by Gerrit Code Review
parent dcb81b5520 d0d98aa2fe
commit ebe8f43f63
12 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/environments/multinode-containers.yaml
View File

@ -1,6 +1,3 @@
resource_registry:
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
parameter_defaults:
ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2'
ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2'

1
environments/docker-ha.yaml
View File

@ -16,7 +16,6 @@ resource_registry:
OS::TripleO::Services::MySQL: ../deployment/database/mysql-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::OVNDBs: ../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
parameter_defaults:
ContainerCli: podman

1
environments/podman-ha.yaml
View File

@ -15,7 +15,6 @@ resource_registry:
OS::TripleO::Services::MySQL: ../deployment/database/mysql-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::OVNDBs: ../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
parameter_defaults:
ContainerCli: podman

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

@ -2,7 +2,6 @@
resource_registry:
OS::TripleO::Services::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.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

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

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

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

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

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

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

1
environments/services/neutron-ovn-standalone.yaml
View File

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

1
environments/standalone/standalone-tripleo.yaml
View File

@ -103,7 +103,6 @@ resource_registry:
OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
OS::TripleO::Services::ManilaScheduler: OS::Heat::None
OS::TripleO::Services::ManilaShare: OS::Heat::None
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml
OS::TripleO::Services::Redis: OS::Heat::None

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -137,7 +137,7 @@ resource_registry:
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-cluster-ansible.yaml
OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OvsDpdkNetcontrold: OS::Heat::None

16
releasenotes/notes/default-ovn-to-raft-cluster-9a1fb213d28d0650.yaml Normal file
View File

@ -0,0 +1,16 @@
---
prelude: >
The default ovsdb-server deployment mode has been switched from
active/backup with Pacemaker to the native active/active RAFT clustering.
issues:
- |
To operate well at scale, it is important that OVS 2.17+ is used when
deploying with RAFT clustering. Specifically, python-ovs >= 2.17.1 is
required.
upgrade:
- |
When upgrading from a non-RAFT deployment, the old Pacemaker ovn-dbs-bundle
containers will still exist and need to be cleaned up. They will not
interfere with the function of the cluster, as all services connecting to
ovsdb-server will be configured to connect to the server's individual IP
addresses and not the Pacemaker ovsdb-server VIP.

3
sample-env-generator/standalone.yaml
View File

@ -56,9 +56,6 @@ environments:
# this network config is assumed by the tripleo deploy command
OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml
# OVN
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
# Disable Docker