Neutron: update configuration files to Kilo

This commit updates the Neutron's configuration files to be the factory
versions for the Kilo release.  Our custom configuration will be
re-added in a following commit.

Also install configuration files which will are not going to be modified
in the following commit, in the post-install-commands for the chunk; as
opposite to having them laying around in the repo and installing them
with the install-files configuration extension.

1 files changed, 0 insertions, 26 deletions

diff --git a/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini
deleted file mode 100644
index 0aee17eb..00000000
--- a/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[cisco_csr_ipsec]
-# Status check interval in seconds, for VPNaaS IPSec connections used on CSR
-# status_check_interval = 60
-
-# Cisco CSR management port information for REST access used by VPNaaS
-# TODO(pcm): Remove once CSR is integrated in as a Neutron router.
-#
-# Format is:
-# [cisco_csr_rest:<public IP>]
-# rest_mgmt = <mgmt port IP>
-# tunnel_ip = <tunnel IP>
-# username = <user>
-# password = <password>
-# timeout = <timeout>
-# host = <hostname>
-# tunnel_if = <tunnel I/F>
-#
-# where:
-#   public IP ----- Public IP address of router used with a VPN service (1:1 with CSR)
-#   tunnel IP ----- Public IP address of the CSR used for the IPSec tunnel
-#   mgmt port IP -- IP address of CSR for REST API access
-#   user ---------- Username for REST management port access to Cisco CSR
-#   password ------ Password for REST management port access to Cisco CSR
-#   timeout ------- REST request timeout to Cisco CSR (optional)
-#   hostname ------ Name of host where CSR is running as a VM
-#   tunnel I/F ---- CSR port name used for tunnels' IP address