Browse Source

Rename OVN metadata agent configuration file

In order to avoid confusion with the metadata agent in ML2/OVS,
the configuration file for OVN metadata agent is renamed.

Change-Id: I1e47e421a629086ce14444aba9c6e8a8ff3a489f
tags/4.0.0.0b1
Daniel Alvarez 2 years ago
parent
commit
512171e132

+ 2
- 2
devstack/lib/networking-ovn View File

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

+ 1
- 1
doc/source/conf.py View File

@@ -87,7 +87,7 @@ latex_documents = [
87 87
 
88 88
 _config_generator_config_files = [
89 89
     'ml2_conf.ini',
90
-    'metadata_agent.ini',
90
+    'networking_ovn_metadata_agent.ini',
91 91
 ]
92 92
 
93 93
 def _get_config_generator_config_definition(config_file):

+ 0
- 6
doc/source/configuration/metadata_agent.rst View File

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

+ 6
- 0
doc/source/configuration/networking_ovn_metadata_agent.rst View File

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

+ 0
- 9
doc/source/configuration/samples/metadata_agent.rst View File

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

+ 9
- 0
doc/source/configuration/samples/networking_ovn_metadata_agent.rst View File

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

etc/oslo-config-generator/metadata_agent.ini → etc/oslo-config-generator/networking_ovn_metadata_agent.ini View File

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

+ 3
- 3
tox.ini View File

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

Loading…
Cancel
Save