neutron: move templates

56 files changed, 64 insertions, 65 deletions

diff --git a/openstack/manifest b/openstack/manifest
index 7fa649ab..8d4b6cf8 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -85,71 +85,70 @@
 0100644 0 0 /etc/systemd/system/openstack-cinder-volume.service
 0100644 0 0 /etc/systemd/system/openstack-cinder-backup.service
 0040755 0 0 /etc/neutron
-0040755 0 0 /var/lib/neutron
-0100644 0 0 /etc/neutron/neutron.conf
-0100644 0 0 /etc/neutron/api-paste.ini
-0100644 0 0 /etc/neutron/policy.json
-0100644 0 0 /etc/neutron/l3_agent.ini
-0100644 0 0 /etc/neutron/dhcp_agent.ini
-0100644 0 0 /etc/neutron/lbaas_agent.ini
-0100644 0 0 /etc/neutron/metadata_agent.ini
-0100644 0 0 /etc/neutron/fwaas_driver.ini
-0100644 0 0 /etc/neutron/metering_agent.ini
-0100644 0 0 /etc/neutron/vpn_agent.ini
-0040755 0 0 /etc/neutron/plugins/
-0040755 0 0 /etc/neutron/plugins/bigswitch
-0100644 0 0 /etc/neutron/plugins/bigswitch/restproxy.ini
-0040755 0 0 /etc/neutron/plugins/bigswitch/ssl
-0040755 0 0 /etc/neutron/plugins/bigswitch/ssl/ca_certs
-0040755 0 0 /etc/neutron/plugins/bigswitch/ssl/host_certs
-0100644 0 0 /etc/neutron/plugins/bigswitch/ssl/ca_certs/README
-0100644 0 0 /etc/neutron/plugins/bigswitch/ssl/host_certs/README
-0040755 0 0 /etc/neutron/plugins/brocade
-0100644 0 0 /etc/neutron/plugins/brocade/brocade.ini
-0040755 0 0 /etc/neutron/plugins/cisco
-0100644 0 0 /etc/neutron/plugins/cisco/cisco_cfg_agent.ini
-0100644 0 0 /etc/neutron/plugins/cisco/cisco_plugins.ini
-0100644 0 0 /etc/neutron/plugins/cisco/cisco_router_plugin.ini
-0100644 0 0 /etc/neutron/plugins/cisco/cisco_vpn_agent.ini
-0040755 0 0 /etc/neutron/plugins/embrane
-0100644 0 0 /etc/neutron/plugins/embrane/heleos_conf.ini
-0040755 0 0 /etc/neutron/plugins/hyperv
-0100644 0 0 /etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
-0040755 0 0 /etc/neutron/plugins/ibm
-0100644 0 0 /etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini
-0040755 0 0 /etc/neutron/plugins/linuxbridge
-0100644 0 0 /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
-0040755 0 0 /etc/neutron/plugins/metaplugin
-0100644 0 0 /etc/neutron/plugins/metaplugin/metaplugin.ini
-0040755 0 0 /etc/neutron/plugins/midonet
-0100644 0 0 /etc/neutron/plugins/midonet/midonet.ini
-0040755 0 0 /etc/neutron/plugins/ml2
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_arista.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_brocade.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_cisco.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_mlnx.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_ncs.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_odl.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_ofa.ini
-0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_sriov.ini
-0040755 0 0 /etc/neutron/plugins/mlnx
-0100644 0 0 /etc/neutron/plugins/mlnx/mlnx_conf.ini
-0040755 0 0 /etc/neutron/plugins/nec
-0100644 0 0 /etc/neutron/plugins/nec/nec.ini
-0040755 0 0 /etc/neutron/plugins/nuage
-0100644 0 0 /etc/neutron/plugins/nuage/nuage_plugin.ini
-0040755 0 0 /etc/neutron/plugins/oneconvergence
-0100644 0 0 /etc/neutron/plugins/oneconvergence/nvsdplugin.ini
-0040755 0 0 /etc/neutron/plugins/opencontrail
-0100644 0 0 /etc/neutron/plugins/opencontrail/contrailplugin.ini
-0040755 0 0 /etc/neutron/plugins/openvswitch
-0100644 0 0 /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-0040755 0 0 /etc/neutron/plugins/plumgrid
-0100644 0 0 /etc/neutron/plugins/plumgrid/plumgrid.ini
-0040755 0 0 /etc/neutron/plugins/vmware
-0100644 0 0 /etc/neutron/plugins/vmware/nsx.ini
+0100644 0 0 /usr/share/openstack/neutron/neutron.conf
+0100644 0 0 /usr/share/openstack/neutron/api-paste.ini
+0100644 0 0 /usr/share/openstack/neutron/policy.json
+0100644 0 0 /usr/share/openstack/neutron/l3_agent.ini
+0100644 0 0 /usr/share/openstack/neutron/dhcp_agent.ini
+0100644 0 0 /usr/share/openstack/neutron/lbaas_agent.ini
+0100644 0 0 /usr/share/openstack/neutron/metadata_agent.ini
+0100644 0 0 /usr/share/openstack/neutron/fwaas_driver.ini
+0100644 0 0 /usr/share/openstack/neutron/metering_agent.ini
+0100644 0 0 /usr/share/openstack/neutron/vpn_agent.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/
+0040755 0 0 /usr/share/openstack/neutron/plugins/bigswitch
+0100644 0 0 /usr/share/openstack/neutron/plugins/bigswitch/restproxy.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/bigswitch/ssl
+0040755 0 0 /usr/share/openstack/neutron/plugins/bigswitch/ssl/ca_certs
+0040755 0 0 /usr/share/openstack/neutron/plugins/bigswitch/ssl/host_certs
+0100644 0 0 /usr/share/openstack/neutron/plugins/bigswitch/ssl/ca_certs/README
+0100644 0 0 /usr/share/openstack/neutron/plugins/bigswitch/ssl/host_certs/README
+0040755 0 0 /usr/share/openstack/neutron/plugins/brocade
+0100644 0 0 /usr/share/openstack/neutron/plugins/brocade/brocade.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/cisco
+0100644 0 0 /usr/share/openstack/neutron/plugins/cisco/cisco_cfg_agent.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/cisco/cisco_plugins.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/cisco/cisco_router_plugin.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/embrane
+0100644 0 0 /usr/share/openstack/neutron/plugins/embrane/heleos_conf.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/hyperv
+0100644 0 0 /usr/share/openstack/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/ibm
+0100644 0 0 /usr/share/openstack/neutron/plugins/ibm/sdnve_neutron_plugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/linuxbridge
+0100644 0 0 /usr/share/openstack/neutron/plugins/linuxbridge/linuxbridge_conf.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/metaplugin
+0100644 0 0 /usr/share/openstack/neutron/plugins/metaplugin/metaplugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/midonet
+0100644 0 0 /usr/share/openstack/neutron/plugins/midonet/midonet.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/ml2
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_arista.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_brocade.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_cisco.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_fslsdn.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_mlnx.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_ncs.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_odl.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_ofa.ini
+0100644 0 0 /usr/share/openstack/neutron/plugins/ml2/ml2_conf_sriov.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/mlnx
+0100644 0 0 /usr/share/openstack/neutron/plugins/mlnx/mlnx_conf.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/nec
+0100644 0 0 /usr/share/openstack/neutron/plugins/nec/nec.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/nuage
+0100644 0 0 /usr/share/openstack/neutron/plugins/nuage/nuage_plugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/oneconvergence
+0100644 0 0 /usr/share/openstack/neutron/plugins/oneconvergence/nvsdplugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/opencontrail
+0100644 0 0 /usr/share/openstack/neutron/plugins/opencontrail/contrailplugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/openvswitch
+0100644 0 0 /usr/share/openstack/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/plumgrid
+0100644 0 0 /usr/share/openstack/neutron/plugins/plumgrid/plumgrid.ini
+0040755 0 0 /usr/share/openstack/neutron/plugins/vmware
+0100644 0 0 /usr/share/openstack/neutron/plugins/vmware/nsx.ini
 0100755 0 0 /usr/share/openstack/openstack-neutron-setup
 0100644 0 0 /etc/systemd/system/openstack-neutron-setup.service
 0100644 0 0 /etc/systemd/system/openstack-neutron-server.service
diff --git a/openstack/etc/neutron/api-paste.ini b/openstack/usr/share/openstack/neutron/api-paste.ini
index 24193fcd..24193fcd 100644
--- a/openstack/etc/neutron/api-paste.ini
+++ b/openstack/usr/share/openstack/neutron/api-paste.ini
diff --git a/openstack/etc/neutron/dhcp_agent.ini b/openstack/usr/share/openstack/neutron/dhcp_agent.ini
index de177b6f..de177b6f 100644
--- a/openstack/etc/neutron/dhcp_agent.ini
+++ b/openstack/usr/share/openstack/neutron/dhcp_agent.ini
diff --git a/openstack/etc/neutron/fwaas_driver.ini b/openstack/usr/share/openstack/neutron/fwaas_driver.ini
index 41f761ab..41f761ab 100644
--- a/openstack/etc/neutron/fwaas_driver.ini
+++ b/openstack/usr/share/openstack/neutron/fwaas_driver.ini
diff --git a/openstack/etc/neutron/l3_agent.ini b/openstack/usr/share/openstack/neutron/l3_agent.ini
index e29c88c4..e29c88c4 100644
--- a/openstack/etc/neutron/l3_agent.ini
+++ b/openstack/usr/share/openstack/neutron/l3_agent.ini
diff --git a/openstack/etc/neutron/lbaas_agent.ini b/openstack/usr/share/openstack/neutron/lbaas_agent.ini
index 8d231b5c..8d231b5c 100644
--- a/openstack/etc/neutron/lbaas_agent.ini
+++ b/openstack/usr/share/openstack/neutron/lbaas_agent.ini
diff --git a/openstack/etc/neutron/metadata_agent.ini b/openstack/usr/share/openstack/neutron/metadata_agent.ini
index 688dbbc5..688dbbc5 100644
--- a/openstack/etc/neutron/metadata_agent.ini
+++ b/openstack/usr/share/openstack/neutron/metadata_agent.ini
diff --git a/openstack/etc/neutron/metering_agent.ini b/openstack/usr/share/openstack/neutron/metering_agent.ini
index 88826ce7..88826ce7 100644
--- a/openstack/etc/neutron/metering_agent.ini
+++ b/openstack/usr/share/openstack/neutron/metering_agent.ini
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf
index 1e832ccd..1e832ccd 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/usr/share/openstack/neutron/neutron.conf
diff --git a/openstack/etc/neutron/plugins/bigswitch/restproxy.ini b/openstack/usr/share/openstack/neutron/plugins/bigswitch/restproxy.ini
index 36e99bd7..36e99bd7 100644
--- a/openstack/etc/neutron/plugins/bigswitch/restproxy.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/bigswitch/restproxy.ini
diff --git a/openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README b/openstack/usr/share/openstack/neutron/plugins/bigswitch/ssl/ca_certs/README
index e7e47a27..e7e47a27 100644
--- a/openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README
+++ b/openstack/usr/share/openstack/neutron/plugins/bigswitch/ssl/ca_certs/README
diff --git a/openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README b/openstack/usr/share/openstack/neutron/plugins/bigswitch/ssl/host_certs/README
index 8f5f5e77..8f5f5e77 100644
--- a/openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README
+++ b/openstack/usr/share/openstack/neutron/plugins/bigswitch/ssl/host_certs/README
diff --git a/openstack/etc/neutron/plugins/brocade/brocade.ini b/openstack/usr/share/openstack/neutron/plugins/brocade/brocade.ini
index 916e9e5d..916e9e5d 100644
--- a/openstack/etc/neutron/plugins/brocade/brocade.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/brocade/brocade.ini
diff --git a/openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_cfg_agent.ini
index d99e8382..d99e8382 100644
--- a/openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_cfg_agent.ini
diff --git a/openstack/etc/neutron/plugins/cisco/cisco_plugins.ini b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_plugins.ini
index a93bc7f1..a93bc7f1 100644
--- a/openstack/etc/neutron/plugins/cisco/cisco_plugins.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_plugins.ini
diff --git a/openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_router_plugin.ini
index 3ef271d2..3ef271d2 100644
--- a/openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_router_plugin.ini
diff --git a/openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini
index 0aee17eb..0aee17eb 100644
--- a/openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini
diff --git a/openstack/etc/neutron/plugins/embrane/heleos_conf.ini b/openstack/usr/share/openstack/neutron/plugins/embrane/heleos_conf.ini
index 0ca9b46f..0ca9b46f 100644
--- a/openstack/etc/neutron/plugins/embrane/heleos_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/embrane/heleos_conf.ini
diff --git a/openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini b/openstack/usr/share/openstack/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
index 5eeec570..5eeec570 100644
--- a/openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
diff --git a/openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini b/openstack/usr/share/openstack/neutron/plugins/ibm/sdnve_neutron_plugin.ini
index 0fab5070..0fab5070 100644
--- a/openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ibm/sdnve_neutron_plugin.ini
diff --git a/openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini b/openstack/usr/share/openstack/neutron/plugins/linuxbridge/linuxbridge_conf.ini
index 94fe9803..94fe9803 100644
--- a/openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/linuxbridge/linuxbridge_conf.ini
diff --git a/openstack/etc/neutron/plugins/metaplugin/metaplugin.ini b/openstack/usr/share/openstack/neutron/plugins/metaplugin/metaplugin.ini
index 2b9bfa5e..2b9bfa5e 100644
--- a/openstack/etc/neutron/plugins/metaplugin/metaplugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/metaplugin/metaplugin.ini
diff --git a/openstack/etc/neutron/plugins/midonet/midonet.ini b/openstack/usr/share/openstack/neutron/plugins/midonet/midonet.ini
index 6cc02117..6cc02117 100644
--- a/openstack/etc/neutron/plugins/midonet/midonet.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/midonet/midonet.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
index 58e5fe21..58e5fe21 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_arista.ini
index abaf5bc7..abaf5bc7 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_arista.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_brocade.ini
index 67574110..67574110 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_brocade.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_cisco.ini
index 1b69100e..1b69100e 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_cisco.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_fslsdn.ini
index 6ee4a4e0..6ee4a4e0 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_fslsdn.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_mlnx.ini
index 46139aed..46139aed 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_mlnx.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_ncs.ini
index dbbfcbd2..dbbfcbd2 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_ncs.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_odl.ini
index 9e88c1bb..9e88c1bb 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_odl.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_ofa.ini
index 4a94b987..4a94b987 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_ofa.ini
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_sriov.ini
index f9522e7f..f9522e7f 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_sriov.ini
diff --git a/openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini b/openstack/usr/share/openstack/neutron/plugins/mlnx/mlnx_conf.ini
index b1225111..b1225111 100644
--- a/openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/mlnx/mlnx_conf.ini
diff --git a/openstack/etc/neutron/plugins/nec/nec.ini b/openstack/usr/share/openstack/neutron/plugins/nec/nec.ini
index 798a5a61..798a5a61 100644
--- a/openstack/etc/neutron/plugins/nec/nec.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/nec/nec.ini
diff --git a/openstack/etc/neutron/plugins/nuage/nuage_plugin.ini b/openstack/usr/share/openstack/neutron/plugins/nuage/nuage_plugin.ini
index aad37bd5..aad37bd5 100644
--- a/openstack/etc/neutron/plugins/nuage/nuage_plugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/nuage/nuage_plugin.ini
diff --git a/openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini b/openstack/usr/share/openstack/neutron/plugins/oneconvergence/nvsdplugin.ini
index a1c05d97..a1c05d97 100644
--- a/openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/oneconvergence/nvsdplugin.ini
diff --git a/openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini b/openstack/usr/share/openstack/neutron/plugins/opencontrail/contrailplugin.ini
index 629f1fc4..629f1fc4 100644
--- a/openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/opencontrail/contrailplugin.ini
diff --git a/openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/openstack/usr/share/openstack/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
index 232ca71d..232ca71d 100644
--- a/openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
diff --git a/openstack/etc/neutron/plugins/plumgrid/plumgrid.ini b/openstack/usr/share/openstack/neutron/plugins/plumgrid/plumgrid.ini
index bfe8062a..bfe8062a 100644
--- a/openstack/etc/neutron/plugins/plumgrid/plumgrid.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/plumgrid/plumgrid.ini
diff --git a/openstack/etc/neutron/plugins/vmware/nsx.ini b/openstack/usr/share/openstack/neutron/plugins/vmware/nsx.ini
index a9bf5c5e..a9bf5c5e 100644
--- a/openstack/etc/neutron/plugins/vmware/nsx.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/vmware/nsx.ini
diff --git a/openstack/etc/neutron/policy.json b/openstack/usr/share/openstack/neutron/policy.json
index 3f692281..3f692281 100644
--- a/openstack/etc/neutron/policy.json
+++ b/openstack/usr/share/openstack/neutron/policy.json
diff --git a/openstack/etc/neutron/rootwrap.conf b/openstack/usr/share/openstack/neutron/rootwrap.conf
index ab5f4393..ab5f4393 100644
--- a/openstack/etc/neutron/rootwrap.conf
+++ b/openstack/usr/share/openstack/neutron/rootwrap.conf
diff --git a/openstack/etc/neutron/rootwrap.d/cisco-apic.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/cisco-apic.filters
index 69e4afcc..69e4afcc 100644
--- a/openstack/etc/neutron/rootwrap.d/cisco-apic.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/cisco-apic.filters
diff --git a/openstack/etc/neutron/rootwrap.d/debug.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/debug.filters
index b61d9601..b61d9601 100644
--- a/openstack/etc/neutron/rootwrap.d/debug.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/debug.filters
diff --git a/openstack/etc/neutron/rootwrap.d/dhcp.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/dhcp.filters
index 0712ec13..0712ec13 100644
--- a/openstack/etc/neutron/rootwrap.d/dhcp.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/dhcp.filters
diff --git a/openstack/etc/neutron/rootwrap.d/ipset-firewall.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/ipset-firewall.filters
index 52c66373..52c66373 100644
--- a/openstack/etc/neutron/rootwrap.d/ipset-firewall.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/ipset-firewall.filters
diff --git a/openstack/etc/neutron/rootwrap.d/iptables-firewall.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/iptables-firewall.filters
index b8a6ab5b..b8a6ab5b 100644
--- a/openstack/etc/neutron/rootwrap.d/iptables-firewall.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/iptables-firewall.filters
diff --git a/openstack/etc/neutron/rootwrap.d/l3.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/l3.filters
index be69b32c..be69b32c 100644
--- a/openstack/etc/neutron/rootwrap.d/l3.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/l3.filters
diff --git a/openstack/etc/neutron/rootwrap.d/lbaas-haproxy.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/lbaas-haproxy.filters
index b4e1ecba..b4e1ecba 100644
--- a/openstack/etc/neutron/rootwrap.d/lbaas-haproxy.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/lbaas-haproxy.filters
diff --git a/openstack/etc/neutron/rootwrap.d/linuxbridge-plugin.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/linuxbridge-plugin.filters
index 03df3959..03df3959 100644
--- a/openstack/etc/neutron/rootwrap.d/linuxbridge-plugin.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/linuxbridge-plugin.filters
diff --git a/openstack/etc/neutron/rootwrap.d/nec-plugin.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/nec-plugin.filters
index 89c4cfe3..89c4cfe3 100644
--- a/openstack/etc/neutron/rootwrap.d/nec-plugin.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/nec-plugin.filters
diff --git a/openstack/etc/neutron/rootwrap.d/ofagent.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/ofagent.filters
index 11e42564..11e42564 100644
--- a/openstack/etc/neutron/rootwrap.d/ofagent.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/ofagent.filters
diff --git a/openstack/etc/neutron/rootwrap.d/openvswitch-plugin.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/openvswitch-plugin.filters
index b63a83b9..b63a83b9 100644
--- a/openstack/etc/neutron/rootwrap.d/openvswitch-plugin.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/openvswitch-plugin.filters
diff --git a/openstack/etc/neutron/rootwrap.d/vpnaas.filters b/openstack/usr/share/openstack/neutron/rootwrap.d/vpnaas.filters
index 7848136b..7848136b 100644
--- a/openstack/etc/neutron/rootwrap.d/vpnaas.filters
+++ b/openstack/usr/share/openstack/neutron/rootwrap.d/vpnaas.filters
diff --git a/openstack/etc/neutron/vpn_agent.ini b/openstack/usr/share/openstack/neutron/vpn_agent.ini
index c3089df9..c3089df9 100644
--- a/openstack/etc/neutron/vpn_agent.ini
+++ b/openstack/usr/share/openstack/neutron/vpn_agent.ini