From 819805d708cccc6e1419a47b16fc012955ce9156 Mon Sep 17 00:00:00 2001 From: Numan Siddique <nusiddiq@redhat.com> Date: Mon, 2 Jul 2018 11:33:11 +0530 Subject: [PATCH] OVN: Remove environment files which deploy OVN dbs in non HA In a 3 node controller deployment OVN db servers are started only on one node and if that node goes down, we hit the down time for ovsdb-servers and neutron-server. So it is highly recommended to deploy OVN db servers as a pacemaker HA resource. Change-Id: Ia2f50d539bf6afbeb67610a925f9f4ea0849d735 Closes-bug: #1779123 --- environments/neutron-ml2-ovn-dvr.yaml | 28 --------------- environments/neutron-ml2-ovn.yaml | 31 ----------------- .../services-baremetal/neutron-ovn-dvr.yaml | 28 --------------- .../services-baremetal/neutron-ovn.yaml | 33 ------------------ environments/services/neutron-ovn-dvr.yaml | 32 ----------------- environments/services/neutron-ovn.yaml | 34 ------------------- ...move-nonha-env-files-7b68a1e656b9f753.yaml | 8 +++++ 7 files changed, 8 insertions(+), 186 deletions(-) delete mode 100644 environments/neutron-ml2-ovn-dvr.yaml delete mode 100644 environments/neutron-ml2-ovn.yaml delete mode 100644 environments/services-baremetal/neutron-ovn-dvr.yaml delete mode 100644 environments/services-baremetal/neutron-ovn.yaml delete mode 100644 environments/services/neutron-ovn-dvr.yaml delete mode 100644 environments/services/neutron-ovn.yaml create mode 100644 releasenotes/notes/ovn-remove-nonha-env-files-7b68a1e656b9f753.yaml diff --git a/environments/neutron-ml2-ovn-dvr.yaml b/environments/neutron-ml2-ovn-dvr.yaml deleted file mode 100644 index bac9a3b637..0000000000 --- a/environments/neutron-ml2-ovn-dvr.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# A Heat environment file which can be used to enable OVN -# extensions, configured via docker -resource_registry: - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN - 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::NeutronDhcpAgent: OS::Heat::None - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronMetadataAgent: 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,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - NeutronEnableDVR: true diff --git a/environments/neutron-ml2-ovn.yaml b/environments/neutron-ml2-ovn.yaml deleted file mode 100644 index 9cb4f19967..0000000000 --- a/environments/neutron-ml2-ovn.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# A Heat environment file which can be used to enable OVN -# extensions, configured via docker -resource_registry: - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN - OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml - OS::TripleO::Services::OVNDBs: ../docker/services/ovn-dbs.yaml - OS::TripleO::Services::OVNMetadataAgent: ../docker/services/ovn-metadata.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::NeutronDhcpAgent: OS::Heat::None - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: 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,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - - ComputeParameters: - NeutronBridgeMappings: "" - NetworkerParameters: - OVNCMSOptions: "enable-chassis-as-gw" diff --git a/environments/services-baremetal/neutron-ovn-dvr.yaml b/environments/services-baremetal/neutron-ovn-dvr.yaml deleted file mode 100644 index a20b9d4b6b..0000000000 --- a/environments/services-baremetal/neutron-ovn-dvr.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 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: ../../puppet/services/ovn-controller.yaml - OS::TripleO::Services::OVNDBs: ../../puppet/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::ComputeNeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronMetadataAgent: 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,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - NeutronEnableDVR: true diff --git a/environments/services-baremetal/neutron-ovn.yaml b/environments/services-baremetal/neutron-ovn.yaml deleted file mode 100644 index abda062e3f..0000000000 --- a/environments/services-baremetal/neutron-ovn.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# 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: ../../puppet/services/ovn-controller.yaml - OS::TripleO::Services::OVNDBs: ../../puppet/services/ovn-dbs.yaml - OS::TripleO::Services::OVNMetadataAgent: ../../puppet/services/ovn-metadata.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,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - NeutronPluginExtensions: "qos,port_security,dns" - ComputeParameters: - NeutronBridgeMappings: "" - ControllerParameters: - OVNCMSOptions: "enable-chassis-as-gw" - NetworkerParameters: - OVNCMSOptions: "enable-chassis-as-gw" diff --git a/environments/services/neutron-ovn-dvr.yaml b/environments/services/neutron-ovn-dvr.yaml deleted file mode 100644 index 33b3c4ae7f..0000000000 --- a/environments/services/neutron-ovn-dvr.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# 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 - OS::TripleO::Services::OVNMetadataAgent: ../../docker/services/ovn-metadata.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::ComputeNeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronMetadataAgent: 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,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - NeutronEnableDVR: true - ControllerParameters: - OVNCMSOptions: "enable-chassis-as-gw" - OVNDnsServers: [] diff --git a/environments/services/neutron-ovn.yaml b/environments/services/neutron-ovn.yaml deleted file mode 100644 index 22c1af2d5e..0000000000 --- a/environments/services/neutron-ovn.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# 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 - OS::TripleO::Services::OVNMetadataAgent: ../../docker/services/ovn-metadata.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,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - NeutronPluginExtensions: "qos,port_security,dns" - ComputeParameters: - NeutronBridgeMappings: "" - ControllerParameters: - OVNCMSOptions: "enable-chassis-as-gw" - NetworkerParameters: - OVNCMSOptions: "enable-chassis-as-gw" - OVNDnsServers: [] diff --git a/releasenotes/notes/ovn-remove-nonha-env-files-7b68a1e656b9f753.yaml b/releasenotes/notes/ovn-remove-nonha-env-files-7b68a1e656b9f753.yaml new file mode 100644 index 0000000000..d436ea3942 --- /dev/null +++ b/releasenotes/notes/ovn-remove-nonha-env-files-7b68a1e656b9f753.yaml @@ -0,0 +1,8 @@ +--- +other: + - | + Removed environment files to deploy OVN db servers in non HA mode for OVN + deployments as it is not recommended. There is no support to upgrade an existing + OVN deployments from non HA to HA. It is recommended to have a fresh deployment. + To deploy OVN with dvr support, use environment/services/neutron-ovn-dvr-ha.yaml, + otherwise use environment/services/neutron-ovn-ha.yaml