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:
parent
8f1de0c11a
commit
d9f63269f1
|
@ -33,7 +33,10 @@ from nose.plugins.attrib import attr
|
||||||
from nose import with_setup
|
from nose import with_setup
|
||||||
from nose.exc import SkipTest
|
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
|
from novaclient.v1_1 import client as nova_client
|
||||||
import heat
|
import heat
|
||||||
from heat import utils
|
from heat import utils
|
||||||
|
|
|
@ -21,7 +21,10 @@ import base64
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
import re
|
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.common import exception
|
||||||
|
|
||||||
from heat.openstack.common import log as logging
|
from heat.openstack.common import log as logging
|
||||||
|
|
Loading…
Reference in New Issue