remove $proj-dist.conf for centos

diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init
index 5b35ea064008bf909466deb82012925f0df18acd..f7268aa826f5c511c5bd036344932631077d384c 100644 (file)
--- a/rpm/SOURCES/neutron-dhcp-agent.init
+++ b/rpm/SOURCES/neutron-dhcp-agent.init
@@ -13,7 +13,6 @@ plugin=dhcp-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/dhcp_agent.ini" \
 )

diff --git a/rpm/SOURCES/neutron-l3-agent.init b/rpm/SOURCES/neutron-l3-agent.init
index cceeb6d2c49c61960d2fb29a5cd8b59cd271e36a..d37eea61cba1de1145be2c41e35af1c67b75f892 100644 (file)
--- a/rpm/SOURCES/neutron-l3-agent.init
+++ b/rpm/SOURCES/neutron-l3-agent.init
@@ -13,7 +13,6 @@ plugin=l3-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/l3_agent.ini" \
 )

diff --git a/rpm/SOURCES/neutron-lbaas-agent.init b/rpm/SOURCES/neutron-lbaas-agent.init
index 31ac1ce6a49965900757c6f964131e00b98cf62b..f433a00d5f724bd8ba60f106a69b186910c09fa6 100644 (file)
--- a/rpm/SOURCES/neutron-lbaas-agent.init
+++ b/rpm/SOURCES/neutron-lbaas-agent.init
@@ -13,7 +13,6 @@ plugin=lbaas-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/lbaas_agent.ini" \
 )

diff --git a/rpm/SOURCES/neutron-linuxbridge-agent.init b/rpm/SOURCES/neutron-linuxbridge-agent.init
index 141a9750bf5588f117b91df30b57ec2e8e2f146a..3403e2bf0b2a09b10deabfc30af16f85ad92fafa 100644 (file)
--- a/rpm/SOURCES/neutron-linuxbridge-agent.init
+++ b/rpm/SOURCES/neutron-linuxbridge-agent.init
@@ -13,7 +13,6 @@ plugin=linuxbridge-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/linuxbridge/linuxbridge_conf.ini" \
 )

diff --git a/rpm/SOURCES/neutron-metadata-agent.init b/rpm/SOURCES/neutron-metadata-agent.init
index b895086202ec86c8de9489249db954b897029545..d8b819f125fb3b72269886630340779b941daa63 100644 (file)
--- a/rpm/SOURCES/neutron-metadata-agent.init
+++ b/rpm/SOURCES/neutron-metadata-agent.init
@@ -13,7 +13,6 @@ plugin=metadata-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/metadata_agent.ini" \
 )

diff --git a/rpm/SOURCES/neutron-metering-agent.init b/rpm/SOURCES/neutron-metering-agent.init
index 8c7ab4f016684e1cc5e227104631e5e808986b7a..798babaf4cc992b5fb48b0714db8940d969ddb27 100644 (file)
--- a/rpm/SOURCES/neutron-metering-agent.init
+++ b/rpm/SOURCES/neutron-metering-agent.init
@@ -13,7 +13,6 @@ plugin=metering-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/metering_agent.ini" \
 )

diff --git a/rpm/SOURCES/neutron-mlnx-agent.init b/rpm/SOURCES/neutron-mlnx-agent.init
index c19f33bfaaebebc2c3e7b0ae8cdad9e0b49c1c44..4db57c91b6f7977a673574f2927fd7e0453b8f1b 100644 (file)
--- a/rpm/SOURCES/neutron-mlnx-agent.init
+++ b/rpm/SOURCES/neutron-mlnx-agent.init
@@ -13,7 +13,6 @@ plugin=mlnx-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/mlnx/mlnx_conf.ini" \
 )

diff --git a/rpm/SOURCES/neutron-nec-agent.init b/rpm/SOURCES/neutron-nec-agent.init
index ff1b877f77dba91b91b20b12c4ac60da686b3f02..3cb7a2a49f7d64e353d0a698a9c9e67d62394575 100644 (file)
--- a/rpm/SOURCES/neutron-nec-agent.init
+++ b/rpm/SOURCES/neutron-nec-agent.init
@@ -13,7 +13,6 @@ plugin=nec-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/nec/nec.ini" \
 )

diff --git a/rpm/SOURCES/neutron-openvswitch-agent.init b/rpm/SOURCES/neutron-openvswitch-agent.init
index 6aa5dc7f131a8bffb03c5a413bbd2cc12972e3ce..ace2f9bb59298d241b5f372327fffcad4c032f1f 100644 (file)
--- a/rpm/SOURCES/neutron-openvswitch-agent.init
+++ b/rpm/SOURCES/neutron-openvswitch-agent.init
@@ -13,7 +13,6 @@ plugin=openvswitch-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
 )

diff --git a/rpm/SOURCES/neutron-ovs-cleanup.init b/rpm/SOURCES/neutron-ovs-cleanup.init
index 0694022a504fbf322bcb432535e873ebeaf874bd..7d9bd8060bec9412f1843e1c785907e5a534a2db 100644 (file)
--- a/rpm/SOURCES/neutron-ovs-cleanup.init
+++ b/rpm/SOURCES/neutron-ovs-cleanup.init
@@ -13,7 +13,6 @@ prog=$proj-ovs-cleanup
 exec="/usr/bin/$prog"
 pidfile="/var/run/$proj/$prog.pid"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
 )

diff --git a/rpm/SOURCES/neutron-ryu-agent.init b/rpm/SOURCES/neutron-ryu-agent.init
index 89dcaced8cd9bda2a85aa3fb4987c5212bd33031..449eb722841fef3131852626cb906f2a28e7dad4 100644 (file)
--- a/rpm/SOURCES/neutron-ryu-agent.init
+++ b/rpm/SOURCES/neutron-ryu-agent.init
@@ -13,7 +13,6 @@ plugin=ryu-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/plugins/ryu/ryu.ini" \
 )

diff --git a/rpm/SOURCES/neutron-server.init b/rpm/SOURCES/neutron-server.init
index d5ccc9f0a51783296b08c26db105b34a386cc540..ede214ffccb280d27f6db789d0f94ab6a6d6c139 100644 (file)
--- a/rpm/SOURCES/neutron-server.init
+++ b/rpm/SOURCES/neutron-server.init
@@ -12,7 +12,6 @@
 prog=neutron
 exec="/usr/bin/$prog-server"
 configs=(
-    "/usr/share/$prog/$prog-dist.conf" \
     "/etc/$prog/$prog.conf" \
     "/etc/$prog/plugin.ini" \
 )

diff --git a/rpm/SOURCES/neutron-vpn-agent.init b/rpm/SOURCES/neutron-vpn-agent.init
index 6a5acfee22bfe504cdd4a2b0bf06f619c7bfb8c0..9c4d74b0ddd8eca30f91e52ed0278a3c84ddc878 100644 (file)
--- a/rpm/SOURCES/neutron-vpn-agent.init
+++ b/rpm/SOURCES/neutron-vpn-agent.init
@@ -13,7 +13,6 @@ plugin=vpn-agent
 prog=$proj-$plugin
 exec="/usr/bin/$prog"
 configs=(
-    "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/vpn_agent.ini" \
 )