From 094604707fb44ff3e2b510756e254bd39fcaca9f Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Mon, 27 Aug 2012 16:03:20 +1000
Subject: Include launch-index in openstack style metadata.

Resolves bug 1042020.

Change-Id: I545b771e24a15e109b06b76e9c34a78bc1425b6c
---
 nova/api/metadata/base.py   | 1 +
 nova/tests/test_metadata.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 24bdb592f..a35eb4c2a 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -294,6 +294,7 @@ class InstanceMetadata():
                                           FLAGS.dhcp_domain)
 
         metadata['name'] = self.instance['display_name']
+        metadata['launch_index'] = self.instance['launch_index']
         metadata['availability_zone'] = self.availability_zone
 
         data = {
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index e06515e39..45228b3bb 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -288,6 +288,9 @@ class OpenStackMetadataTestCase(test.TestCase):
         self.assertEqual(mddict['public_keys'][self.instance['key_name']],
             self.instance['key_data'])
 
+        self.assertTrue('launch_index' in mddict)
+        self.assertEqual(mddict['launch_index'], self.instance['launch_index'])
+
         # verify that each of the things we put in content
         # resulted in an entry in 'files', that their content
         # there is as expected, and that /content lists them.
-- 
cgit