openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Use ephemeral Heat client if set"

This commit is contained in:
Zuul 2021-04-28 01:22:14 +00:00 committed by Gerrit Code Review
parent 99894215a7 ac1f255507
commit c72a83c30c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tripleo_ansible/ansible_plugins/module_utils/tripleo_common_utils.py
View File

@ -19,6 +19,8 @@
# tripleo-common expects the legacy clients. Once # tripleo-common expects the legacy clients. Once
# we've updated tripleo-common to use the SDK we # we've updated tripleo-common to use the SDK we
# should revise this. # should revise this.
import os
from glanceclient import client as glanceclient from glanceclient import client as glanceclient
from heatclient.v1 import client as heatclient from heatclient.v1 import client as heatclient
from ironicclient import client as ironicclient from ironicclient import client as ironicclient
@ -30,6 +32,14 @@ from tripleo_common.utils import parameters
import ironic_inspector_client import ironic_inspector_client
try:
# TODO(slagle): the try/except can be removed once tripleo_common is
# released with
# https://review.opendev.org/c/openstack/tripleo-common/+/787819
from tripleo_common.utils import heat
except ImportError:
heat = None
class DeriveParamsError(Exception): class DeriveParamsError(Exception):
"""Error while performing a derive parameters operation""" """Error while performing a derive parameters operation"""
@ -74,8 +84,14 @@ class TripleOCommon(object):
if 'heatclient' in self.client_cache: if 'heatclient' in self.client_cache:
return self.client_cache['heatclient'] return self.client_cache['heatclient']
else: else:
self.client_cache['heatclient'] = \ if heat and os.environ.get('OS_HEAT_TYPE', '') == 'ephemeral':
heatclient.Client(session=self.sess) host = os.environ.get('OS_HEAT_HOST', '127.0.0.1')
port = os.environ.get('OS_HEAT_PORT', 8006)
self.client_cache['heatclient'] = \
heat.local_orchestration_client(host, int(port))
else:
self.client_cache['heatclient'] = \
heatclient.Client(session=self.sess)
return self.client_cache['heatclient'] return self.client_cache['heatclient']
def get_compute_client(self): def get_compute_client(self):