From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 27 Nov 2012 14:29:34 +0000 (+0000)
Subject: Removes obsolete --config-file-/etc/nova/nova.conf from starting arguments of init... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d9900b6f1345c3e922e96372c31e7946f7c3e845;p=openstack-build%2Fceilometer-build.git

Removes obsolete --config-file-/etc/nova/nova.conf from starting arguments of init scripts

Rewritten-From: 2d11a4b6657b2fc1ac3dd2f2c94f2b7e2b80fbe1
---

diff --git a/trusty/debian/ceilometer-agent-central.init b/trusty/debian/ceilometer-agent-central.init
index fa2fff1..9a43dd9 100644
--- a/trusty/debian/ceilometer-agent-central.init
+++ b/trusty/debian/ceilometer-agent-central.init
@@ -16,8 +16,6 @@ DESC="Ceilometer Agent Central"
 SYS_NAME=ceilometer
 NAME=ceilometer-agent-central
 DAEMON=/usr/bin/ceilometer-agent-central
-DAEMON_ARGS="--config-file /etc/nova/nova.conf"
-[ -f '/etc/nova/nova-compute.conf' ] && DAEMON_ARGS=${DAEMON_ARGS}" --config-file=/etc/nova/nova-compute.conf"
 
 SCRIPTNAME=/etc/init.d/${NAME}
 DAEMON_USER=${SYS_NAME}
diff --git a/trusty/debian/ceilometer-agent-compute.init b/trusty/debian/ceilometer-agent-compute.init
index 1429ed4..f9af5af 100644
--- a/trusty/debian/ceilometer-agent-compute.init
+++ b/trusty/debian/ceilometer-agent-compute.init
@@ -16,8 +16,6 @@ DESC="Ceilometer Agent Compute"
 SYS_NAME=ceilometer
 NAME=ceilometer-agent-compute
 DAEMON=/usr/bin/ceilometer-agent-compute
-DAEMON_ARGS="--config-file /etc/nova/nova.conf"
-[ -f '/etc/nova/nova-compute.conf' ] && DAEMON_ARGS=${DAEMON_ARGS}" --config-file=/etc/nova/nova-compute.conf"
 
 SCRIPTNAME=/etc/init.d/${NAME}
 DAEMON_USER=${SYS_NAME}
diff --git a/trusty/debian/ceilometer-collector.init b/trusty/debian/ceilometer-collector.init
index 7ba862e..8e23d2a 100644
--- a/trusty/debian/ceilometer-collector.init
+++ b/trusty/debian/ceilometer-collector.init
@@ -17,8 +17,6 @@ DESC="Ceilometer Collector"
 SYS_NAME=ceilometer
 NAME=ceilometer-collector
 DAEMON=/usr/bin/${NAME}
-DAEMON_ARGS="--config-file /etc/nova/nova.conf"
-[ -f '/etc/nova/nova-compute.conf' ] && DAEMON_ARGS=${DAEMON_ARGS}" --config-file=/etc/nova/nova-compute.conf"
 
 SCRIPTNAME=/etc/init.d/${NAME}
 DAEMON_USER=${SYS_NAME}