Merge lp:~mathiaz/eucalyptus/k-fix-network-index-values into lp:~ubuntu-core-dev/eucalyptus/ubuntu-karmic

[Mathias Gug]

[Dustin Kirkland  (kirkland)]

review: Approve

=== modified file 'cluster/handlers.c'
--- cluster/handlers.c	2009-10-22 14:06:55 +0000
+++ cluster/handlers.c	2009-11-02 23:20:26 +0000
@@ -1484,7 +1484,9 @@
 	  allocate_ccInstance(myInstance, instId, amiId, kernelId, ramdiskId, amiURL, kernelURL, ramdiskURL, ownerId, "Pending", time(NULL), reservationId, &(myInstance->ccnet), &(myInstance->ccvm), myInstance->ncHostIdx, keyName, myInstance->serviceTag, userData, launchIndex, myInstance->groupNames, myInstance->volumes, myInstance->volumesSize, myInstance->networkIndex);
 
 	  // instance info that CC has
-	  myInstance->networkIndex = thenidx;
+	  if (thenidx >= 0) {
+	    myInstance->networkIndex = networkIndexList[thenidx];
+	  }
 	  myInstance->ts = time(NULL);
 	  if (strcmp(pubip, "0.0.0.0")) {
 	    strncpy(myInstance->ccnet.publicIp, pubip, 16);
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-11-02 23:10:25 +0000
+++ debian/changelog	2009-11-02 23:20:26 +0000
@@ -11,6 +11,10 @@
   * debian/eucalyptus-common.eucalyptus.upstart: Add -l to eucalyptus-cloud
     options so that cloud-output.log is affected by LOGLEVEL (LP: #458001)
 
+  [ Mathias Gug ]
+  * cluster/handlers.c: Fix the networkIndex returned by describeInstances.
+    (LP: #454405 - upstream revno 933).
+
  -- Thierry Carrez <[e-mail]>  Tue, 20 Oct 2009 12:26:19 +0200
 
 eucalyptus (1.6~bzr931-0ubuntu7) karmic; urgency=low