Generate networking_bgpvpn.conf
Replace the hard-coded networking_bgpvpn.conf file by the one generated by oslo-config-generator. This effectively removes the generated networking-bgpvpn.conf.sample which is used only for documentation. Change-Id: I045a7f22c13d35c71506bab5d4b9a6208db2d540 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
7 changed files with 8 additions and 16 deletions
@@ -14,7 +14,8 @@ elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then
if is_service_enabled neutron-api || is_service_enabled q-svc; then
echo_summary "Configuring networking-bgpvpn"
neutron_service_plugin_class_add bgpvpn
mkdir -v -p $(dirname $NETWORKING_BGPVPN_CONF) && cp -v $NETWORKING_BGPVPN_DIR/etc/neutron/networking_bgpvpn.conf $NETWORKING_BGPVPN_CONF
(cd $NETWORKING_BGPVPN_DIR && ./tools/generate_config_file_samples.sh)
mkdir -v -p $(dirname $NETWORKING_BGPVPN_CONF) && cp -v $NETWORKING_BGPVPN_DIR/etc/networking_bgpvpn.conf.sample $NETWORKING_BGPVPN_CONF
inicomment $NETWORKING_BGPVPN_CONF service_providers service_provider
iniadd $NETWORKING_BGPVPN_CONF service_providers service_provider $NETWORKING_BGPVPN_DRIVER
neutron_server_config_add $NETWORKING_BGPVPN_CONF
@@ -89,7 +89,7 @@ latex_elements = {
# -- Options for oslo_config.sphinxconfiggen ---------------------------------
_config_generator_config_files = [
'networking-bgpvpn.conf',
'networking_bgpvpn.conf',
]
def _get_config_generator_config_definition(conf_file):
@@ -1,5 +1,5 @@
======================
networking-bgpvpn.conf
networking_bgpvpn.conf
======================
To use networking-bgpvpn, you need to configure one of valid service providers
@@ -11,4 +11,4 @@ BGPVPN but only one of them can be default.
* BaGPipe provider: ``service_provider = BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default``
.. show-options::
:config-file: etc/oslo-config-generator/networking-bgpvpn.conf
:config-file: etc/oslo-config-generator/networking_bgpvpn.conf
@@ -1,9 +1,9 @@
=============================
Sample networking-bgpvpn.conf
Sample networking_bgpvpn.conf
=============================
This sample configuration can also be viewed in `the raw format
<../../_static/config-samples/networking-bgpvpn.conf.sample>`_.
.. literalinclude::
../../_static/config-samples/networking-bgpvpn.conf.sample
../../_static/config-samples/networking_bgpvpn.conf.sample
@@ -1,6 +0,0 @@
[service_providers]
# both cannot be default, please choose:
service_provider=BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default
#service_provider=BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default
@@ -1,5 +1,5 @@
[DEFAULT]
output_file = etc/neutron/networking-bgpvpn.conf.sample
output_file = etc/networking_bgpvpn.conf.sample
wrap_width = 79
namespace = networking-bgpvpn.service_provider
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.