openstack
/
charm-tempest
Code Issues Proposed changes

Merge pull request #5 from gnuoy/master 

Catch the case where the keystone client is not ready and pre-create …
This commit is contained in:
James Page 2016-05-12 09:14:53 +01:00
parent 82c35c913a c5695a5f83
commit b42e5dc386
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/charm/openstack/tempest.py
View File

@ -13,8 +13,6 @@ import charm.openstack.adapters as adapters
import charmhelpers.core.hookenv as hookenv
import charmhelpers.fetch as fetch
from charmhelpers.core.host import mkdir
tempest_charm = None
@ -91,11 +89,11 @@ class TempestAdminAdapter(adapters.OpenStackRelationAdapter):
@returns {'image_id' id1, 'image_alt_id': id2}
"""
self.init_keystone_client()
glance_endpoint = self.kc.service_catalog.url_for(
service_type='image',
endpoint_type='publicURL')
image_info = {}
try:
glance_endpoint = self.kc.service_catalog.url_for(
service_type='image',
endpoint_type='publicURL')
glance_client = glanceclient.Client(
'2', glance_endpoint, token=self.kc.auth_token)
for image in glance_client.images.list():
@ -115,11 +113,11 @@ class TempestAdminAdapter(adapters.OpenStackRelationAdapter):
@returns {'image_id' id1, 'image_alt_id': id2}
"""
self.init_keystone_client()
neutron_ep = self.kc.service_catalog.url_for(
service_type='network',
endpoint_type='publicURL')
network_info = {}
try:
neutron_ep = self.kc.service_catalog.url_for(
service_type='network',
endpoint_type='publicURL')
neutron_client = neutronclient.Client(
endpoint_url=neutron_ep,
token=self.kc.auth_token)
@ -148,16 +146,17 @@ class TempestAdminAdapter(adapters.OpenStackRelationAdapter):
@returns {'flavor_id' id1, 'flavor_alt_id': id2}
"""
self.init_keystone_client()
nova_ep = self.kc.service_catalog.url_for(
service_type='compute',
endpoint_type='publicURL'
)
compute_info = {}
compute_info['nova_endpoint'] = nova_ep
url = urllib.parse.urlparse(nova_ep)
compute_info['nova_base'] = '{}://{}'.format(url.scheme,
url.netloc.split(':')[0])
try:
nova_ep = self.kc.service_catalog.url_for(
service_type='compute',
endpoint_type='publicURL'
)
compute_info['nova_endpoint'] = nova_ep
url = urllib.parse.urlparse(nova_ep)
compute_info['nova_base'] = '{}://{}'.format(
url.scheme,
url.netloc.split(':')[0])
nova_client = novaclient.client.Client(
self.keystone_info['service_username'],
self.keystone_info['service_password'],
@ -276,6 +275,11 @@ class TempestCharm(charm.OpenStackCharm):
PIP_CONF: [],
}
def setup_directories(self):
for tempest_dir in [self.TEMPEST_ROOT, self.TEMPEST_LOGDIR]:
if not os.path.exists(tempest_dir):
os.mkdir(tempest_dir)
def setup_git(self, branch, git_dir):
"""Clone tempest and symlink in rendered tempest.conf"""
conf = hookenv.config()
@ -305,7 +309,6 @@ class TempestCharm(charm.OpenStackCharm):
@return git_dir, logfile, run_dir
"""
log_time_str = time.strftime("%Y%m%d%H%M%S", time.gmtime())
mkdir(self.TEMPEST_LOGDIR)
git_dir = '{}/tempest-{}'.format(self.TEMPEST_ROOT, branch_name)
logfile = '{}/run_{}.log'.format(self.TEMPEST_LOGDIR, log_time_str)
run_dir = '{}/tempest'.format(git_dir)
@ -319,6 +322,7 @@ class TempestCharm(charm.OpenStackCharm):
action_info = {
'tempest-logfile': logfile,
}
self.setup_directories()
self.setup_git(branch_name, git_dir)
self.execute_tox(run_dir, logfile, tox_target)
hookenv.action_set(action_info)