summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-27 15:56:37 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 18:29:30 +0100
commitffbc364ae4fed1117d5f4e8b12c16c4d8c1b3a24 (patch)
treeaf4c2da2ac676e2717da2bce55e77a8a5b22456a
parentd0d13633cd383a320535c4cdbda52ae79055a9b9 (diff)
downloaddefinitions-ffbc364ae4fed1117d5f4e8b12c16c4d8c1b3a24.tar.gz
neutron: Move templates to /usr/share/openstack/neutron
Also change placehoders to jinja2 type
-rw-r--r--openstack/usr/share/openstack/neutron/api-paste.ini (renamed from openstack/etc/neutron/api-paste.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/dhcp_agent.ini (renamed from openstack/etc/neutron/dhcp_agent.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/fwaas_driver.ini (renamed from openstack/etc/neutron/fwaas_driver.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/l3_agent.ini (renamed from openstack/etc/neutron/l3_agent.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/lbaas_agent.ini (renamed from openstack/etc/neutron/lbaas_agent.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/metadata_agent.ini (renamed from openstack/etc/neutron/metadata_agent.ini)10
-rw-r--r--openstack/usr/share/openstack/neutron/metering_agent.ini (renamed from openstack/etc/neutron/metering_agent.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/neutron.conf (renamed from openstack/etc/neutron/neutron.conf)28
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/bigswitch/restproxy.ini (renamed from openstack/etc/neutron/plugins/bigswitch/restproxy.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/bigswitch/ssl/ca_certs/README (renamed from openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/bigswitch/ssl/host_certs/README (renamed from openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/brocade/brocade.ini (renamed from openstack/etc/neutron/plugins/brocade/brocade.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/cisco/cisco_cfg_agent.ini (renamed from openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/cisco/cisco_plugins.ini (renamed from openstack/etc/neutron/plugins/cisco/cisco_plugins.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/cisco/cisco_router_plugin.ini (renamed from openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/cisco/cisco_vpn_agent.ini (renamed from openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/embrane/heleos_conf.ini (renamed from openstack/etc/neutron/plugins/embrane/heleos_conf.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/hyperv/hyperv_neutron_plugin.ini (renamed from openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ibm/sdnve_neutron_plugin.ini (renamed from openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/linuxbridge/linuxbridge_conf.ini (renamed from openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/metaplugin/metaplugin.ini (renamed from openstack/etc/neutron/plugins/metaplugin/metaplugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/midonet/midonet.ini (renamed from openstack/etc/neutron/plugins/midonet/midonet.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_arista.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_brocade.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_cisco.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_fslsdn.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_mlnx.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_ncs.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_odl.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_ofa.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf_sriov.ini (renamed from openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/mlnx/mlnx_conf.ini (renamed from openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/nec/nec.ini (renamed from openstack/etc/neutron/plugins/nec/nec.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/nuage/nuage_plugin.ini (renamed from openstack/etc/neutron/plugins/nuage/nuage_plugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/oneconvergence/nvsdplugin.ini (renamed from openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/opencontrail/contrailplugin.ini (renamed from openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/openvswitch/ovs_neutron_plugin.ini (renamed from openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/plumgrid/plumgrid.ini (renamed from openstack/etc/neutron/plugins/plumgrid/plumgrid.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/vmware/nsx.ini (renamed from openstack/etc/neutron/plugins/vmware/nsx.ini)0
-rw-r--r--openstack/usr/share/openstack/neutron/policy.json (renamed from openstack/etc/neutron/policy.json)0
-rw-r--r--openstack/usr/share/openstack/neutron/vpn_agent.ini (renamed from openstack/etc/neutron/vpn_agent.ini)0
42 files changed, 19 insertions, 19 deletions
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..26ca9385 100644
--- a/openstack/etc/neutron/metadata_agent.ini
+++ b/openstack/usr/share/openstack/neutron/metadata_agent.ini
@@ -4,21 +4,21 @@ debug = True
verbose = True
# The Neutron user information for accessing the Neutron API.
-auth_url = ##KEYSTONE_INTERNAL_URL##
+auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
auth_region = regionOne
# Turn off verification of the certificate for ssl
# auth_insecure = False
# Certificate Authority public key (CA cert) file for ssl
# auth_ca_cert =
admin_tenant_name = service
-admin_user = ##NEUTRON_SERVICE_USER##
-admin_password = ##NEUTRON_SERVICE_PASSWORD##
+admin_user = {{ NEUTRON_SERVICE_USER }}
+admin_password = {{ NEUTRON_SERVICE_PASSWORD }}
# Network service endpoint type to pull from the keystone catalog
# endpoint_type = adminURL
# IP address used by Nova metadata server
-nova_metadata_ip = ##NOVA_HOST##
+nova_metadata_ip = {{ CONTROLLER_HOST_ADDRESS }}
# TCP Port used by Nova metadata server
# nova_metadata_port = 8775
@@ -41,7 +41,7 @@ nova_metadata_ip = ##NOVA_HOST##
# shared secret to prevent spoofing. You may select any string for a secret,
# but it must match here and in the configuration used by the Nova Metadata
# Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret
-metadata_proxy_shared_secret = ##METADATA_PROXY_SHARED_SECRET##
+metadata_proxy_shared_secret = {{ METADATA_PROXY_SHARED_SECRET }}
# Location of Metadata Proxy UNIX domain socket
# metadata_proxy_socket = $state_path/metadata_proxy
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..4608e732 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/usr/share/openstack/neutron/neutron.conf
@@ -246,19 +246,19 @@ notify_nova_on_port_data_changes = True
nova_url = http://onenode:8774/v2
# Name of nova region to use. Useful if keystone manages more than one region
-nova_region_name = ##NOVA_REGION##
+nova_region_name = regionOne
# Username for connection to nova in admin context
-nova_admin_username = ##NOVA_SERVICE_USER##
+nova_admin_username = {{ NOVA_SERVICE_USER }}
# The uuid of the admin nova tenant
-nova_admin_tenant_id = ##SERVICE_TENANT_ID##
+nova_admin_tenant_id = {{ SERVICE_TENANT_ID }}
# Password for connection to nova in admin context.
-nova_admin_password = ##NOVA_SERVICE_PASSWORD##
+nova_admin_password = {{ NOVA_SERVICE_PASSWORD }}
# Authorization URL for connection to nova in admin context.
-nova_admin_auth_url = ##KEYSTONE_ADMIN_URL##
+nova_admin_auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
# CA file for novaclient to verify server certificates
# nova_ca_certificates_file =
@@ -343,11 +343,11 @@ nova_admin_auth_url = ##KEYSTONE_ADMIN_URL##
# The RabbitMQ broker address where a single node is used.
# (string value)
-rabbit_host=##RABBITMQ_HOST##
+rabbit_host={{ RABBITMQ_HOST }}
# The RabbitMQ broker port where a single node is used.
# (integer value)
-rabbit_port=##RABBITMQ_PORT##
+rabbit_port={{ RABBITMQ_PORT }}
# RabbitMQ HA cluster host:port pairs. (list value)
#rabbit_hosts=$rabbit_host:$rabbit_port
@@ -356,10 +356,10 @@ rabbit_port=##RABBITMQ_PORT##
#rabbit_use_ssl=false
# The RabbitMQ userid. (string value)
-rabbit_userid=##RABBITMQ_USER##
+rabbit_userid={{ RABBITMQ_USER }}
# The RabbitMQ password. (string value)
-rabbit_password=##RABBITMQ_PASSWORD##
+rabbit_password={{ RABBITMQ_PASSWORD }}
# the RabbitMQ login method (string value)
#rabbit_login_method=AMQPLAIN
@@ -557,11 +557,11 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
# =========== end of items for agent management extension =====
[keystone_authtoken]
-auth_uri = ##KEYSTONE_PUBLIC_URL##
-identity_uri = ##IDENTITY_URI##
+auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
+identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
admin_tenant_name = service
-admin_user = ##NEUTRON_SERVICE_USER##
-admin_password = ##NEUTRON_SERVICE_PASSWORD##
+admin_user = {{ NEUTRON_SERVICE_USER }}
+admin_password = {{ NEUTRON_SERVICE_PASSWORD }}
[database]
# This line MUST be changed to actually run the plugin.
@@ -575,7 +575,7 @@ admin_password = ##NEUTRON_SERVICE_PASSWORD##
# to put the [database] section and its connection attribute in this
# configuration file.
#connection=sqlite:////var/lib/neutron/neutron.sqlite
-connection=postgresql://##NEUTRON_DB_USER##:##NEUTRON_DB_PASSWORD##@onenode/neutron
+connection=postgresql://{{ NEUTRON_DB_USER }}:{{ NEUTRON_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/neutron
# Database engine for which script will be generated when using offline
# migration
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/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