Browse Source

Merge "Remove opencontrail configurations"

Zuul 7 months ago
parent
commit
c7130671f6

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

@@ -95,7 +95,6 @@ blockdiag_html_image_format = "svg"
95 95
 
96 96
 _config_generator_config_files = [
97 97
     'networking-bgpvpn.conf',
98
-    'opencontrail-driver.conf',
99 98
 ]
100 99
 
101 100
 def _get_config_generator_config_definition(conf_file):

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

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

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

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

+ 0
- 5
etc/oslo-config-generator/opencontrail-driver.conf View File

@@ -1,5 +0,0 @@
1
-[DEFAULT]
2
-output_file = etc/neutron/opencontrail-driver.conf.sample
3
-wrap_width = 79
4
-
5
-namespace = networking-bgpvpn.opencontrail_driver

Loading…
Cancel
Save