openstack
/
heat
Code Issues Proposed changes

heat : fix glanceclient deprecation warning 

glanceclient module name changed for F18, so do
a conditional import which should import the correct
version provided one is available (tested on F17/F18)

Fixes #251

Change-Id: I095560f29a408949a7d54795fc000c094b1d63b9
Signed-off-by: Steven Hardy <shardy@redhat.com>
This commit is contained in:
Steven Hardy 2012-09-26 14:51:08 +01:00
parent 8f1de0c11a
commit d9f63269f1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/tests/functional/util.py
View File

@ -33,7 +33,10 @@ from nose.plugins.attrib import attr
from nose import with_setup
from nose.exc import SkipTest
from glance import client as glance_client
try:
from glanceclient import client as glance_client
except ImportError:
from glance import client as glance_client
from novaclient.v1_1 import client as nova_client
import heat
from heat import utils

5
heat/utils.py
View File

@ -21,7 +21,10 @@ import base64
from lxml import etree
import re
from glance import client as glance_client
try:
from glanceclient import client as glance_client
except ImportError:
from glance import client as glance_client
from heat.common import exception
from heat.openstack.common import log as logging