From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Thu, 29 May 2014 13:28:15 +0000 (+0200)
Subject: Added missing plugin .ini files to setup.cfg
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=712feaa3fce38e64685948f332bdebef4f067178;p=openstack-build%2Fneutron-build.git

Added missing plugin .ini files to setup.cfg

Some plugin .ini configuration files were missing and hence not
installed via 'setup.py install'.

Conflicts:
	setup.cfg

Change-Id: I31f096e7fbf9f7a182ba8535ca8cadc4fecc6632
Partial-Bug: 1324487
(cherry picked from commit a75e156af64afb61f3ebf928eda132325e5a46f5)
---

diff --git a/setup.cfg b/setup.cfg
index 70ea858d8..0d7c703ce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -52,23 +52,29 @@ data_files =
         etc/neutron/plugins/bigswitch/ssl/ca_certs/README
         etc/neutron/plugins/bigswitch/ssl/host_certs/README
     etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini
-    etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_plugins.ini
+    etc/neutron/plugins/cisco =
+        etc/neutron/plugins/cisco/cisco_plugins.ini
+        etc/neutron/plugins/cisco/cisco_vpn_agent.ini
+    etc/neutron/plugins/embrane = etc/neutron/plugins/embrane/heleos_conf.ini
     etc/neutron/plugins/hyperv = etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
     etc/neutron/plugins/ibm = etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini
     etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
     etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini
     etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
     etc/neutron/plugins/ml2 =
+        etc/neutron/plugins/bigswitch/restproxy.ini
         etc/neutron/plugins/ml2/ml2_conf.ini
         etc/neutron/plugins/ml2/ml2_conf_arista.ini
         etc/neutron/plugins/ml2/ml2_conf_brocade.ini
         etc/neutron/plugins/ml2/ml2_conf_cisco.ini
+        etc/neutron/plugins/ml2/ml2_conf_mlnx.ini
+        etc/neutron/plugins/ml2/ml2_conf_ncs.ini
         etc/neutron/plugins/ml2/ml2_conf_odl.ini
-        etc/neutron/plugins/bigswitch/restproxy.ini
         etc/neutron/plugins/ml2/ml2_conf_ofa.ini
     etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
     etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini
     etc/neutron/plugins/nicira = etc/neutron/plugins/nicira/nvp.ini
+    etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini
     etc/neutron/plugins/oneconvergence = etc/neutron/plugins/oneconvergence/nvsdplugin.ini
     etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
     etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini