openstack/neutron-vpnaas
Code Issues Proposed changes

Remove redundant neutron prefix from ovn vpn agent config

Browse Source 
Most of the agent config files, except for the one used by OVN metadata
agent, does not contain the neutron_ prefix (metadata_agent.ini or
metering_atent.ini for example). The prefix is redundant because
the config files are usually created in the /etc/neutron directory.

Change-Id: Ibff6ab20e7309873cb7dd241264b4694646c52c1
This commit is contained in:
Takashi Kajinami 2024-01-14 00:09:00 +09:00
parent 2d4762d55d
commit 0b0aafa062
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -55,7 +55,7 @@ function neutron_vpnaas_configure_agent {
}
function neutron_vpnaas_configure_ovn_agent {
cp $NEUTRON_VPNAAS_DIR/etc/neutron_ovn_vpn_agent.ini.sample $OVN_VPNAGENT_CONF
cp $NEUTRON_VPNAAS_DIR/etc/ovn_vpn_agent.ini.sample $OVN_VPNAGENT_CONF
iniset $OVN_VPNAGENT_CONF DEFAULT interface_driver openvswitch
iniset $OVN_VPNAGENT_CONF DEFAULT state_path $DATA_DIR/neutron

2
devstack/settings
View File

@ -45,4 +45,4 @@ NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas
NEUTRON_VPNAAS_CONF_FILE=neutron_vpnaas.conf
NEUTRON_VPNAAS_CONF=$NEUTRON_CONF_DIR/$NEUTRON_VPNAAS_CONF_FILE
OVN_VPNAGENT_CONF=$NEUTRON_CONF_DIR/neutron_ovn_vpn_agent.ini
OVN_VPNAGENT_CONF=$NEUTRON_CONF_DIR/ovn_vpn_agent.ini

2
doc/source/conf.py
View File

@ -247,7 +247,7 @@ openstackdocs_bug_tag = 'doc'
_config_generator_config_files = [
'vpn_agent.ini',
'neutron_vpnaas.conf',
'neutron_ovn_vpn_agent.ini',
'ovn_vpn_agent.ini',
]

2
doc/source/configuration/index.rst
View File

@ -15,7 +15,7 @@ Neutron VPNaaS uses the following configuration files for its various services.
neutron_vpnaas
l3_agent
neutron_ovn_vpn_agent
ovn_vpn_agent
The following are sample configuration files for Neutron VPNaaS services and
utilities. These are generated from code and reflect the current state of code

9
doc/source/configuration/neutron_ovn_vpn_agent.rst
View File

@ -1,9 +0,0 @@
=========================
neutron_ovn_vpn_agent.ini
=========================
This is a configuration file for the standalone VPN agent
for a setup based on OVN.
.. show-options::
:config-file: etc/oslo-config-generator/neutron_ovn_vpn_agent.ini

9
doc/source/configuration/ovn_vpn_agent.rst Normal file
View File

@ -0,0 +1,9 @@
=================
ovn_vpn_agent.ini
=================
This is a configuration file for the standalone VPN agent
for a setup based on OVN.
.. show-options::
:config-file: etc/oslo-config-generator/ovn_vpn_agent.ini

8
doc/source/configuration/samples/neutron_ovn_vpn_agent.rst
View File

@ -1,8 +0,0 @@
================================
Sample neutron_ovn_vpn_agent.ini
================================
This sample configuration can also be viewed in `the raw format
<../../_static/config_samples/neutron_ovn_vpn_agent.conf.sample>`_.
.. literalinclude:: ../../_static/config_samples/neutron_ovn_vpn_agent.conf.sample

8
doc/source/configuration/samples/ovn_vpn_agent.rst Normal file
View File

@ -0,0 +1,8 @@
========================
Sample ovn_vpn_agent.ini
========================
This sample configuration can also be viewed in `the raw format
<../../_static/config_samples/ovn_vpn_agent.conf.sample>`_.
.. literalinclude:: ../../_static/config_samples/ovn_vpn_agent.conf.sample

2
doc/source/contributor/vpnaas-for-ovn.rst
View File

@ -35,7 +35,7 @@ Enabling VPNaaS for OVN
service_provider = VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ovn_ipsec.IPsecOvnVPNDriver
#. With OVN there is no L3 agent. Instead a stand-alone VPN agent is installed. There is a new "binary" called
``neutron-ovn-vpn-agent``. Create its configuration file ``/etc/neutron/neutron_ovn_vpn_agent.ini``
``neutron-ovn-vpn-agent``. Create its configuration file ``/etc/neutron/ovn_vpn_agent.ini``
with the following contents:
.. code-block:: ini

2
etc/oslo-config-generator/neutron_ovn_vpn_agent.ini → etc/oslo-config-generator/ovn_vpn_agent.ini
View File

@ -1,5 +1,5 @@
[DEFAULT]
output_file = etc/neutron_ovn_vpn_agent.ini.sample
output_file = etc/ovn_vpn_agent.ini.sample
wrap_width = 79
namespace = neutron.vpnaas.ovn_agent