EndpointNotFound is now handled gracefully
Also reorders imports. Signed-off-by: Jiri Podivin <jpodivin@redhat.com> Change-Id: I5e98c3f9acea1dd045cb979e602dd89f84afeb8d
This commit is contained in:
parent
75005643fc
commit
07fa86619a
|
@ -21,8 +21,9 @@ from glanceclient import client as glance_client
|
||||||
from heatclient import client as heat_client
|
from heatclient import client as heat_client
|
||||||
from heatclient import exc as heat_exc
|
from heatclient import exc as heat_exc
|
||||||
from ironicclient import client as ironic_client
|
from ironicclient import client as ironic_client
|
||||||
from keystoneauth1.identity import generic as ks_id
|
|
||||||
from keystoneauth1 import session as ks_session
|
from keystoneauth1 import session as ks_session
|
||||||
|
from keystoneauth1.exceptions import catalog as catalog_exc
|
||||||
|
from keystoneauth1.identity import generic as ks_id
|
||||||
from novaclient import client as nova_client
|
from novaclient import client as nova_client
|
||||||
from swiftclient.client import Connection
|
from swiftclient.client import Connection
|
||||||
from swiftclient import exceptions as swiftexceptions
|
from swiftclient import exceptions as swiftexceptions
|
||||||
|
@ -83,7 +84,7 @@ def get_ironic_client(auth_variables):
|
||||||
def list_plan_and_stack(hclient, swiftclient):
|
def list_plan_and_stack(hclient, swiftclient):
|
||||||
try:
|
try:
|
||||||
stacks = [s.stack_name for s in hclient.stacks.list()]
|
stacks = [s.stack_name for s in hclient.stacks.list()]
|
||||||
except heat_exc.HTTPNotFound:
|
except (heat_exc.HTTPNotFound, catalog_exc.EndpointNotFound):
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
plan_list = []
|
plan_list = []
|
||||||
|
|
Loading…
Reference in New Issue