From 41e72a809b65ae05538f30246a9fdbd71d3c24b7 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 27 May 2011 12:01:02 -0400 Subject: [PATCH] move agent start script to upstart, to resolve the issue that agent sometimes starts before network in up state --- agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf | 10 ++++++++++ debian/cloud-agent.install | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf diff --git a/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf b/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf new file mode 100644 index 00000000000..8edb8400983 --- /dev/null +++ b/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf @@ -0,0 +1,10 @@ +description "cloudstack agent daemon" +author "Edison Su" + +start on (net-device-up IFACE=cloudbr0) +stop on runlevel [!2345] + +expect fork + +exec /usr/bin/cloud-daemonize -n "cloud-agent" -p /var/run/cloud-agent.pid -l /var/log/cloud/agent/agent.log /usr/bin/agent-runner + diff --git a/debian/cloud-agent.install b/debian/cloud-agent.install index 5a053116690..e2201dfcd7a 100644 --- a/debian/cloud-agent.install +++ b/debian/cloud-agent.install @@ -2,7 +2,7 @@ /etc/cloud/agent/developer.properties.template /etc/cloud/agent/environment.properties /etc/cloud/agent/log4j-cloud.xml -/etc/init.d/cloud-agent +/etc/init/cloud-agent.conf /usr/bin/agent-runner /usr/bin/cloud-setup-agent /usr/lib/cloud/agent/css