From 230e607edf3ad1725b80f9ec05d8b661f96c4b10 Mon Sep 17 00:00:00 2001 From: Sergey Vasilenko Date: Mon, 16 Dec 2013 16:49:27 +0400 Subject: [PATCH] remove $proj-dist.conf for centos --- rpm/SOURCES/neutron-dhcp-agent.init | 1 - rpm/SOURCES/neutron-l3-agent.init | 1 - rpm/SOURCES/neutron-lbaas-agent.init | 1 - rpm/SOURCES/neutron-linuxbridge-agent.init | 1 - rpm/SOURCES/neutron-metadata-agent.init | 1 - rpm/SOURCES/neutron-metering-agent.init | 1 - rpm/SOURCES/neutron-mlnx-agent.init | 1 - rpm/SOURCES/neutron-nec-agent.init | 1 - rpm/SOURCES/neutron-openvswitch-agent.init | 1 - rpm/SOURCES/neutron-ovs-cleanup.init | 1 - rpm/SOURCES/neutron-ryu-agent.init | 1 - rpm/SOURCES/neutron-server.init | 1 - rpm/SOURCES/neutron-vpn-agent.init | 1 - 13 files changed, 13 deletions(-) diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init index 5b35ea064..f7268aa82 100644 --- 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 cceeb6d2c..d37eea61c 100644 --- 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 31ac1ce6a..f433a00d5 100644 --- 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 141a9750b..3403e2bf0 100644 --- 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 b89508620..d8b819f12 100644 --- 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 8c7ab4f01..798babaf4 100644 --- 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 c19f33bfa..4db57c91b 100644 --- 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 ff1b877f7..3cb7a2a49 100644 --- 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 6aa5dc7f1..ace2f9bb5 100644 --- 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 0694022a5..7d9bd8060 100644 --- 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 89dcaced8..449eb7228 100644 --- 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 d5ccc9f0a..ede214ffc 100644 --- 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 6a5acfee2..9c4d74b0d 100644 --- 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" \ ) -- 2.32.3