Remove Neutron VPNaaS static example configuration files
Oslo config generator was introduced in patch [1] to automatically generate the sample Neutron VPNaaS configuration files. This patch removes the static example configuration files from the repository as they are now redundant. [1] https://review.openstack.org/#/c/253399/ Change-Id: Ibf5ed0f1e80d01dd2332a3638974479bca350ecf Partially-Implements: blueprint autogen-neutron-conf-file Partial-bug: #1199963 Depends-On: Icef8f7e8f0e8e78bfffa7a5af3f9f2300376b115
This commit is contained in:
parent
2b4b0eb627
commit
3e63e570fa
|
@ -1,13 +0,0 @@
|
||||||
|
|
||||||
[service_providers]
|
|
||||||
# Must be in form:
|
|
||||||
# service_provider=<service_type>:<name>:<driver>[:default]
|
|
||||||
# List of allowed service types includes VPN
|
|
||||||
# Combination of <service type> and <name> must be unique; <driver> must also be unique
|
|
||||||
# This is multiline option
|
|
||||||
service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
|
|
||||||
# Uncomment the following line (and comment out the OpenSwan VPN line) to enable Cisco's VPN driver.
|
|
||||||
# service_provider=VPN:cisco:neutron_vpnaas.services.vpn.service_drivers.cisco_ipsec.CiscoCsrIPsecVPNDriver:default
|
|
||||||
# Uncomment the following line (and comment out the OpenSwan VPN line) to enable Brocade Vyatta's VPN driver.
|
|
||||||
# service_provider=VPN:vyatta:neutron_vpnaas.services.vpn.service_drivers.vyatta_ipsec.VyattaIPsecDriver:default
|
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
[DEFAULT]
|
|
||||||
# VPN-Agent configuration file
|
|
||||||
# Note vpn-agent inherits l3-agent, so you can use configs on l3-agent also
|
|
||||||
|
|
||||||
[vpnagent]
|
|
||||||
# vpn device drivers which vpn agent will use
|
|
||||||
# If we want to use multiple drivers, we need to define this option multiple times.
|
|
||||||
# NOTE: StrongSwan and openSwan cannot be installed at the same time. Thus, both cannot
|
|
||||||
# be enabled for use. In the future when flavors/STF support is available,
|
|
||||||
# this will still constrain the flavors which can be used together.
|
|
||||||
# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
|
|
||||||
# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.cisco_ipsec.CiscoCsrIPsecDriver
|
|
||||||
# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.vyatta_ipsec.VyattaIPSecDriver
|
|
||||||
# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
|
|
||||||
# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.fedora_strongswan_ipsec.FedoraStrongSwanDriver
|
|
||||||
# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver
|
|
||||||
# vpn_device_driver=another_driver
|
|
||||||
|
|
||||||
[ipsec]
|
|
||||||
# Status check interval
|
|
||||||
# ipsec_status_check_interval=60
|
|
||||||
|
|
||||||
# Enable detail logging for ipsec pluto process.
|
|
||||||
# If the flag set to True, the detailed logging will
|
|
||||||
# be written into config_base_dir/<pid>/log."
|
|
||||||
# NOTE: this applies to OpenSwan and Libraswan, and
|
|
||||||
# that StrongSwan has logging that logs to syslog.
|
|
||||||
# enable_detailed_logging=False
|
|
||||||
|
|
||||||
[strongswan]
|
|
||||||
# For fedora use:
|
|
||||||
# default_config_area=/usr/share/strongswan/templates/config/strongswan.d
|
|
||||||
# Default is for ubuntu use, /etc/strongswan.d
|
|
||||||
# default_config_area=/etc/strongswan.d
|
|
||||||
|
|
||||||
[pluto]
|
|
||||||
# Initial interval in seconds for checking if pluto daemon is shutdown
|
|
||||||
# shutdown_check_timeout=1
|
|
||||||
#
|
|
||||||
# The maximum number of retries for checking for pluto daemon shutdown
|
|
||||||
# shutdown_check_retries=5
|
|
||||||
#
|
|
||||||
# A factor to increase the retry interval for each retry
|
|
||||||
# shutdown_check_back_off=1.5
|
|
||||||
|
|
|
@ -20,9 +20,6 @@ classifier =
|
||||||
packages =
|
packages =
|
||||||
neutron_vpnaas
|
neutron_vpnaas
|
||||||
data_files =
|
data_files =
|
||||||
etc/neutron =
|
|
||||||
etc/neutron_vpnaas.conf
|
|
||||||
etc/vpn_agent.ini
|
|
||||||
etc/neutron/rootwrap.d =
|
etc/neutron/rootwrap.d =
|
||||||
etc/neutron/rootwrap.d/vpnaas.filters
|
etc/neutron/rootwrap.d/vpnaas.filters
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue