Merge lp:~darkmuggle-deactivatedaccount/ubuntu/oneiric/eucalyptus/oneiric into lp:ubuntu/oneiric/eucalyptus

[Ben Howard]

debian/*upstart: changed upstart jobs to use proper runlevels and
  remove redundancy. (LP: #820687)

[James Page (james-page)]

Hi Ben

Thanks for taking the time to prepare this merge proposal.

I think that this late in the release cycle for Oneiric we should not be making this change so I recommend that we defer this MP until P development starts.

Cheers

James

[Marc Deslauriers (mdeslaur)]

Precise is open now. Could you please retarget this to Precise?
Once the change is in Precise, you can prepaer a SRU to get it fixed in Oneiric. Thanks!

review: Needs Fixing

[Martin Pitt (pitti)]

Please set back status to "review" when done. Thanks!

Unmerged revisions

182. By Ben Howard on 2011-09-19

debian/*upstart: changed upstart jobs to use proper runlevels and
remove redundancy. (LP: #820687)

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-15 13:35:03 +0000
+++ debian/changelog	2011-09-19 21:46:32 +0000
@@ -1,3 +1,10 @@
+eucalyptus (2.0.1+bzr1256-0ubuntu8) oneiric; urgency=medium
+
+  * debian/*upstart: changed upstart jobs to use proper runlevels and 
+    remove redundancy. (LP: #820687)
+
+ -- Ben Howard <[e-mail]>  Mon, 19 Sep 2011 15:32:15 -0600
+
 eucalyptus (2.0.1+bzr1256-0ubuntu7) oneiric; urgency=low
 
   * d/patches/28-fix-startup-crash.patch: Fix from Graziano Obertelli

=== modified file 'debian/eucalyptus-cc.eucalyptus-cc-publication.upstart'
--- debian/eucalyptus-cc.eucalyptus-cc-publication.upstart	2010-03-08 14:23:53 +0000
+++ debian/eucalyptus-cc.eucalyptus-cc-publication.upstart	2011-09-19 21:46:32 +0000
@@ -3,7 +3,7 @@
 description "Eucalyptus cluster controller publication"
 author "Matt Zimmerman <[e-mail]>, Dustin Kirkland <[e-mail]>"
 
-start on (started ssh and started avahi-daemon and eucalyptus-network-is-ready)
+start on (started ssh and started avahi-daemon)
 stop on runlevel [!2345]
 
 respawn

=== modified file 'debian/eucalyptus-common.eucalyptus.upstart'
--- debian/eucalyptus-common.eucalyptus.upstart	2011-02-15 10:16:03 +0000
+++ debian/eucalyptus-common.eucalyptus.upstart	2011-09-19 21:46:32 +0000
@@ -3,7 +3,7 @@
 description "Eucalyptus web services"
 author "Matt Zimmerman <[e-mail]>, Dustin Kirkland <[e-mail]>"
 
-start on eucalyptus-network-is-ready
+start on runlevel [2345] 
 stop on runlevel [!2345]
 
 export CLEAN

=== modified file 'debian/eucalyptus-nc.eucalyptus-nc-publication.upstart'
--- debian/eucalyptus-nc.eucalyptus-nc-publication.upstart	2010-03-08 14:23:53 +0000
+++ debian/eucalyptus-nc.eucalyptus-nc-publication.upstart	2011-09-19 21:46:32 +0000
@@ -3,7 +3,7 @@
 description "Eucalyptus node controller publication"
 author "Dustin Kirkland <[e-mail]>"
 
-start on (started ssh and started avahi-daemon and eucalyptus-network-is-ready)
+start on (started ssh and started avahi-daemon)
 stop on runlevel [!2345]
 
 respawn

=== modified file 'debian/eucalyptus-sc.eucalyptus-sc-publication.upstart'
--- debian/eucalyptus-sc.eucalyptus-sc-publication.upstart	2010-03-08 14:23:53 +0000
+++ debian/eucalyptus-sc.eucalyptus-sc-publication.upstart	2011-09-19 21:46:32 +0000
@@ -3,7 +3,7 @@
 description "Eucalyptus storage controller publication"
 author "Colin Watson <[e-mail]>, Dustin Kirkland <[e-mail]>"
 
-start on (started ssh and started avahi-daemon and eucalyptus-network-is-ready)
+start on (started ssh and started avahi-daemon)
 stop on runlevel [!2345]
 
 respawn

=== modified file 'debian/eucalyptus-walrus.eucalyptus-walrus-publication.upstart'
--- debian/eucalyptus-walrus.eucalyptus-walrus-publication.upstart	2010-03-08 14:23:53 +0000
+++ debian/eucalyptus-walrus.eucalyptus-walrus-publication.upstart	2011-09-19 21:46:32 +0000
@@ -3,7 +3,7 @@
 description "Eucalyptus walrus publication"
 author "Colin Watson <[e-mail]>, Dustin Kirkland <[e-mail]>"
 
-start on (started ssh and started avahi-daemon and eucalyptus-network-is-ready)
+start on (started ssh and started avahi-daemon)
 stop on runlevel [!2345]
 
 respawn