Merge "Service split: cleaned up setup.cfg"

etc/fwaas_driver.ini

@@ -1,3 +0,0 @@
-[fwaas]
-#driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
-#enabled = True

etc/lbaas_agent.ini

@@ -1,42 +0,0 @@
-[DEFAULT]
-# Show debugging output in log (sets DEBUG log level output).
-# debug = False
-
-# The LBaaS agent will resync its state with Neutron to recover from any
-# transient notification or rpc errors. The interval is number of
-# seconds between attempts.
-# periodic_interval = 10
-
-# LBaas requires an interface driver be set. Choose the one that best
-# matches your plugin.
-# interface_driver =
-
-# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP,
-# BigSwitch/Floodlight)
-# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
-
-# Use veth for an OVS interface or not.
-# Support kernels with limited namespace support
-# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
-# ovs_use_veth = False
-
-# Example of interface_driver option for LinuxBridge
-# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
-
-# The agent requires drivers to manage the loadbalancer.  HAProxy is the opensource version.
-# Multiple device drivers reflecting different service providers could be specified:
-# device_driver = path.to.provider1.driver.Driver
-# device_driver = path.to.provider2.driver.Driver
-# Default is:
-# device_driver = neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
-
-[haproxy]
-# Location to store config and state files
-# loadbalancer_state_path = $state_path/lbaas
-
-# The user group
-# user_group = nogroup
-
-# When delete and re-add the same vip, send this many gratuitous ARPs to flush
-# the ARP cache in the Router. Set it below or equal to 0 to disable this feature.
-# send_gratuitous_arp = 3

etc/neutron/rootwrap.d/lbaas-haproxy.filters

@@ -1,26 +0,0 @@
-# neutron-rootwrap command filters for nodes on which neutron is
-# expected to control network
-#
-# This file should be owned by (and only-writeable by) the root user
-
-# format seems to be
-# cmd-name: filter-name, raw-command, user, args
-
-[Filters]
-
-# haproxy
-haproxy: CommandFilter, haproxy, root
-
-# lbaas-agent uses kill as well, that's handled by the generic KillFilter
-kill_haproxy_usr: KillFilter, root, /usr/sbin/haproxy, -9, -HUP
-
-ovs-vsctl: CommandFilter, ovs-vsctl, root
-mm-ctl: CommandFilter, mm-ctl, root
-
-# ip_lib
-ip: IpFilter, ip, root
-ip_exec: IpNetnsExecFilter, ip, root
-route: CommandFilter, route, root
-
-# arping
-arping: CommandFilter, arping, root

etc/neutron/rootwrap.d/vpnaas.filters

@@ -1,13 +0,0 @@
-# neutron-rootwrap command filters for nodes on which neutron is
-# expected to control network
-#
-# This file should be owned by (and only-writeable by) the root user
-
-# format seems to be
-# cmd-name: filter-name, raw-command, user, args
-
-[Filters]
-
-ip: IpFilter, ip, root
-ip_exec: IpNetnsExecFilter, ip, root
-openswan: CommandFilter, ipsec, root

etc/vpn_agent.ini

@@ -1,14 +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.
-# vpn_device_driver=neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver
-# vpn_device_driver=neutron.services.vpn.device_drivers.cisco_ipsec.CiscoCsrIPsecDriver
-# vpn_device_driver=another_driver
-
-[ipsec]
-# Status check interval
-# ipsec_status_check_interval=60

setup.cfg

@@ -24,27 +24,22 @@ data_files =
     etc/neutron =
         etc/api-paste.ini
         etc/dhcp_agent.ini
-        etc/fwaas_driver.ini
         etc/l3_agent.ini
-        etc/lbaas_agent.ini
         etc/metadata_agent.ini
         etc/metering_agent.ini
         etc/policy.json
         etc/neutron.conf
         etc/rootwrap.conf
-        etc/vpn_agent.ini
     etc/neutron/rootwrap.d =
         etc/neutron/rootwrap.d/debug.filters
         etc/neutron/rootwrap.d/dhcp.filters
         etc/neutron/rootwrap.d/iptables-firewall.filters
         etc/neutron/rootwrap.d/ipset-firewall.filters
         etc/neutron/rootwrap.d/l3.filters
-        etc/neutron/rootwrap.d/lbaas-haproxy.filters
         etc/neutron/rootwrap.d/linuxbridge-plugin.filters
         etc/neutron/rootwrap.d/nec-plugin.filters
         etc/neutron/rootwrap.d/ofagent.filters
         etc/neutron/rootwrap.d/openvswitch-plugin.filters
-        etc/neutron/rootwrap.d/vpnaas.filters
     etc/init.d = etc/init.d/neutron-server
     etc/neutron/plugins/bigswitch =
         etc/neutron/plugins/bigswitch/restproxy.ini