From 061173571592d837e9b07e0c810291088ce32dda Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 6 Sep 2023 15:19:30 -0400 Subject: [PATCH] Remove ovn.ini example file The ovn.ini file is a hold-over from the networking-ovn tree. The docs all reference configuring OVN (and OVS) options in ml2_conf.ini, so remove the old file and add the neutron.ml2.ovn namespace to etc/oslo-config-generator/ml2_conf.ini. Trivialfix Change-Id: I26dedc80e07aedffb1713560d4431b7a334b70b5 --- doc/source/conf.py | 1 - doc/source/configuration/config-samples.rst | 1 - doc/source/configuration/config.rst | 1 - doc/source/configuration/ovn.rst | 6 ------ doc/source/configuration/samples/ovn.rst | 10 ---------- etc/oslo-config-generator/ml2_conf.ini | 1 + etc/oslo-config-generator/ovn.ini | 6 ------ 7 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 doc/source/configuration/ovn.rst delete mode 100644 doc/source/configuration/samples/ovn.rst delete mode 100644 etc/oslo-config-generator/ovn.ini diff --git a/doc/source/conf.py b/doc/source/conf.py index 0f0620f8c4f..f1e97152888 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -257,7 +257,6 @@ _config_generator_config_files = [ 'ml2_conf.ini', 'neutron.conf', 'openvswitch_agent.ini', - 'ovn.ini', 'sriov_agent.ini', ] diff --git a/doc/source/configuration/config-samples.rst b/doc/source/configuration/config-samples.rst index 7d45f91f559..80a181294c3 100644 --- a/doc/source/configuration/config-samples.rst +++ b/doc/source/configuration/config-samples.rst @@ -15,7 +15,6 @@ Sample Configuration Files samples/macvtap-agent.rst samples/openvswitch-agent.rst samples/sriov-agent.rst - samples/ovn.rst .. toctree:: :maxdepth: 1 diff --git a/doc/source/configuration/config.rst b/doc/source/configuration/config.rst index 78e119886ec..3d8b3b7c3e9 100644 --- a/doc/source/configuration/config.rst +++ b/doc/source/configuration/config.rst @@ -32,7 +32,6 @@ arbitrary file names. macvtap-agent.rst openvswitch-agent.rst sriov-agent.rst - ovn.rst .. toctree:: :maxdepth: 1 diff --git a/doc/source/configuration/ovn.rst b/doc/source/configuration/ovn.rst deleted file mode 100644 index d98c06424be..00000000000 --- a/doc/source/configuration/ovn.rst +++ /dev/null @@ -1,6 +0,0 @@ -======= -ovn.ini -======= - -.. show-options:: - :config-file: etc/oslo-config-generator/ovn.ini diff --git a/doc/source/configuration/samples/ovn.rst b/doc/source/configuration/samples/ovn.rst deleted file mode 100644 index f7160c98fb1..00000000000 --- a/doc/source/configuration/samples/ovn.rst +++ /dev/null @@ -1,10 +0,0 @@ -.. _samples_ovn: - -============== -Sample ovn.ini -============== - -This sample configuration can also be viewed in `the raw format -<../../_static/config-samples/ovn.conf.sample>`_. - -.. literalinclude:: ../../_static/config-samples/ovn.conf.sample diff --git a/etc/oslo-config-generator/ml2_conf.ini b/etc/oslo-config-generator/ml2_conf.ini index ab97bd486bd..b7a490a1923 100644 --- a/etc/oslo-config-generator/ml2_conf.ini +++ b/etc/oslo-config-generator/ml2_conf.ini @@ -3,4 +3,5 @@ output_file = etc/neutron/plugins/ml2/ml2_conf.ini.sample wrap_width = 79 namespace = neutron.ml2 +namespace = neutron.ml2.ovn namespace = oslo.log diff --git a/etc/oslo-config-generator/ovn.ini b/etc/oslo-config-generator/ovn.ini deleted file mode 100644 index 004b032aa68..00000000000 --- a/etc/oslo-config-generator/ovn.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -output_file = etc/neutron/ovn.ini.sample -wrap_width = 79 - -namespace = neutron.ml2.ovn -namespace = oslo.log