From 3e63e570fa0316c5f4be1c939a1826809342a21a Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Sun, 13 Dec 2015 08:48:00 +0000 Subject: [PATCH] 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 --- etc/neutron_vpnaas.conf | 13 ------------ etc/vpn_agent.ini | 45 ----------------------------------------- setup.cfg | 3 --- 3 files changed, 61 deletions(-) delete mode 100644 etc/neutron_vpnaas.conf delete mode 100644 etc/vpn_agent.ini diff --git a/etc/neutron_vpnaas.conf b/etc/neutron_vpnaas.conf deleted file mode 100644 index b3b323db8..000000000 --- a/etc/neutron_vpnaas.conf +++ /dev/null @@ -1,13 +0,0 @@ - -[service_providers] -# Must be in form: -# service_provider=::[:default] -# List of allowed service types includes VPN -# Combination of and must be unique; 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 - diff --git a/etc/vpn_agent.ini b/etc/vpn_agent.ini deleted file mode 100644 index 2f7e16573..000000000 --- a/etc/vpn_agent.ini +++ /dev/null @@ -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//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 - diff --git a/setup.cfg b/setup.cfg index af0feb641..831fcea9e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,9 +20,6 @@ classifier = packages = neutron_vpnaas data_files = - etc/neutron = - etc/neutron_vpnaas.conf - etc/vpn_agent.ini etc/neutron/rootwrap.d = etc/neutron/rootwrap.d/vpnaas.filters