Code Review / openstack-build / ceilometer-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: eb69ba7)
Removes obsolete --config-file-/etc/nova/nova.conf from starting arguments of init...
authorThomas Goirand <thomas@goirand.fr>
Tue, 27 Nov 2012 14:29:34 +0000 (14:29 +0000)
committerThomas Goirand <thomas@goirand.fr>
Tue, 27 Nov 2012 14:29:34 +0000 (14:29 +0000)
Rewritten-From: 2d11a4b6657b2fc1ac3dd2f2c94f2b7e2b80fbe1

trusty/debian/ceilometer-agent-central.init patch | blob | history
trusty/debian/ceilometer-agent-compute.init patch | blob | history
trusty/debian/ceilometer-collector.init patch | blob | history

diff --git a/trusty/debian/ceilometer-agent-central.init b/trusty/debian/ceilometer-agent-central.init
index fa2fff134d3b8c49cff027d6e773f15d38517fb8..9a43dd9ed26d4146d765e84cd71b1279d89ee7e4 100644 (file)
--- 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 1429ed4b6dcc900f8f2c91e834d78d5f52bf930c..f9af5af7e1abfd853205a39f1c7fc01a5d7ee078 100644 (file)
--- 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 7ba862e1b71167a545c4e2aa17f40c7c5521dfbd..8e23d2aeb8c5f2f30c9ff338fe786e3acfc338c5 100644 (file)
--- 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}