diff options
| author | Pradeep Kilambi <pkilambi@cisco.com> | 2014-01-07 11:55:28 -0800 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@cisco.com> | 2014-01-07 11:55:42 -0800 |
| commit | e36f9f32fea2e128e1f03bf2b94ad0584337b2c4 (patch) | |
| tree | 53aaf351cdf7fd0bb0a41aa2183f3849f968b22d /ceilometer/nova_client.py | |
| parent | 2245becc28758a68f6875c82c2f45021f96aeca9 (diff) | |
| download | ceilometer-e36f9f32fea2e128e1f03bf2b94ad0584337b2c4.tar.gz | |
Fix to tackle instances without an image assigned
fixes bug #1233103
Change-Id: I4d4d7bdff09b6748e14ebac8293050513fb18ed2
Diffstat (limited to 'ceilometer/nova_client.py')
| -rw-r--r-- | ceilometer/nova_client.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 9d5193e8..81f93c3c 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -82,7 +82,14 @@ class Client(object): instance.flavor[attr] = getattr(flavor, attr, default) def _with_image(self, instance): - iid = instance.image['id'] + try: + iid = instance.image['id'] + except TypeError: + instance.image = None + instance.kernel_id = None + instance.ramdisk_id = None + return + try: image = self.nova_client.images.get(iid) except novaclient.exceptions.NotFound: |