Merge "Add Heat API client." into stable/8.0

This commit is contained in:
Jenkins 2016-07-13 09:29:03 +00:00 committed by Gerrit Code Review
commit 6d7f77180e
2 changed files with 12 additions and 0 deletions

View File

@ -16,6 +16,7 @@ import time
from urlparse import urlparse
from cinderclient import client as cinderclient
from heatclient.v1.client import Client as HeatClient
from glanceclient.v1 import Client as GlanceClient
import ironicclient.client as ironicclient
from keystoneclient.v2_0 import Client as KeystoneClient
@ -98,6 +99,15 @@ class Common(object):
'insecure': insecure}
self.glance = GlanceClient(**glance_args)
heat_endpoint = self.keystone.service_catalog.url_for(
service_type='orchestration', endpoint_type='publicURL')
heat_args = {'endpoint': make_endpoint(heat_endpoint),
'token': token,
'cacert': path_to_cert,
'insecure': insecure}
self.heat = HeatClient(**heat_args)
try:
ironic_endpoint = self.keystone.service_catalog.url_for(
service_type='baremetal',

View File

@ -12,6 +12,8 @@ python-novaclient>=2.15.0
python-cinderclient>=1.0.5
python-neutronclient>=2.6.0
python-ironicclient>=0.8.0
python-heatclient>=0.6.0
oslo.i18n>=3.1.0
six
Jinja2
AllPairs==2.0.1