Browse Source

Merge "Rename OVN metadata agent configuration file" into stable/pike

changes/75/526475/7
Jenkins 4 years ago
committed by Gerrit Code Review
parent
commit
15fe57571b
  1. 4
      devstack/lib/networking-ovn
  2. 2
      doc/source/conf.py
  3. 6
      doc/source/configuration/metadata_agent.rst
  4. 6
      doc/source/configuration/networking_ovn_metadata_agent.rst
  5. 9
      doc/source/configuration/samples/metadata_agent.rst
  6. 9
      doc/source/configuration/samples/networking_ovn_metadata_agent.rst
  7. 2
      etc/oslo-config-generator/networking_ovn_metadata_agent.ini
  8. 6
      tox.ini

4
devstack/lib/networking-ovn

@ -97,7 +97,7 @@ OVN_L3_SCHEDULER=${OVN_L3_SCHEDULER:-leastloaded}
# Neutron directory
NEUTRON_DIR=$DEST/neutron
OVN_META_CONF=$NEUTRON_CONF_DIR/metadata_agent.ini
OVN_META_CONF=$NEUTRON_CONF_DIR/networking_ovn_metadata_agent.ini
# Set variables for building OVS from source
OVS_REPO=$OVN_REPO
@ -176,7 +176,7 @@ function configure_ovn {
mkdir -p $NETWORKING_OVN_DIR/etc/neutron/plugins/ml2
(cd $NETWORKING_OVN_DIR && exec ./tools/generate_config_file_samples.sh)
cp $NETWORKING_OVN_DIR/etc/metadata_agent.ini.sample $OVN_META_CONF
cp $NETWORKING_OVN_DIR/etc/networking_ovn_metadata_agent.ini.sample $OVN_META_CONF
iniset $OVN_META_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
iniset $OVN_META_CONF DEFAULT nova_metadata_ip $SERVICE_HOST

2
doc/source/conf.py

@ -87,7 +87,7 @@ latex_documents = [
_config_generator_config_files = [
'ml2_conf.ini',
'metadata_agent.ini',
'networking_ovn_metadata_agent.ini',
]
def _get_config_generator_config_definition(config_file):

6
doc/source/configuration/metadata_agent.rst

@ -1,6 +0,0 @@
==================
metadata_agent.ini
==================
.. show-options::
:config-file: etc/oslo-config-generator/metadata_agent.ini

6
doc/source/configuration/networking_ovn_metadata_agent.rst

@ -0,0 +1,6 @@
=================================
networking_ovn_metadata_agent.ini
=================================
.. show-options::
:config-file: etc/oslo-config-generator/networking_ovn_metadata_agent.ini

9
doc/source/configuration/samples/metadata_agent.rst

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

9
doc/source/configuration/samples/networking_ovn_metadata_agent.rst

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

2
etc/oslo-config-generator/metadata_agent.ini → etc/oslo-config-generator/networking_ovn_metadata_agent.ini

@ -1,5 +1,5 @@
[DEFAULT]
output_file = etc/metadata_agent.ini.sample
output_file = etc/networking_ovn_metadata_agent.ini.sample
wrap_width = 79
namespace = networking_ovn.metadata.agent

6
tox.ini

@ -31,8 +31,8 @@ setenv =
{[testenv]setenv}
OS_TEST_PATH=./networking_ovn/tests/functional
OS_TEST_TIMEOUT=120
deps = {[testenv]deps}
-r{toxinidir}/networking_ovn/tests/functional/requirements.txt
deps = {[testenv]deps}
-r{toxinidir}/networking_ovn/tests/functional/requirements.txt
[testenv:functional-py35]
basepython = python3.5
@ -75,7 +75,7 @@ commands = oslo_debug_helper {posargs}
commands =
mkdir -p etc/neutron/plugins/ml2
oslo-config-generator --config-file etc/oslo-config-generator/ml2_conf.ini
oslo-config-generator --config-file etc/oslo-config-generator/metadata_agent.ini
oslo-config-generator --config-file etc/oslo-config-generator/networking_ovn_metadata_agent.ini
whitelist_externals = mkdir
[testenv:releasenotes]

Loading…
Cancel
Save