diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-28 23:37:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-28 23:37:52 +0000 |
| commit | 151f1467ac65d9fc317656b2c7346ccc1b8dce80 (patch) | |
| tree | 9e08c8a7da679d95a812a7f4f10fafea661be77d | |
| parent | 31f6244428cbacbaf2099e8544564f0476c1183f (diff) | |
| parent | 094604707fb44ff3e2b510756e254bd39fcaca9f (diff) | |
| download | nova-151f1467ac65d9fc317656b2c7346ccc1b8dce80.tar.gz nova-151f1467ac65d9fc317656b2c7346ccc1b8dce80.tar.xz nova-151f1467ac65d9fc317656b2c7346ccc1b8dce80.zip | |
Merge "Include launch-index in openstack style metadata."
| -rw-r--r-- | nova/api/metadata/base.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_metadata.py | 3 |
2 files changed, 4 insertions, 0 deletions
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. |