From 844da5667598cd9e7185651be5dca93ee2634ab4 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 24 May 2018 15:46:17 +0100 Subject: [PATCH] Rebuild charm to pick up latest layer-openstack/fix venv action bug This is needed to work around a setuptool_scm bug. Also, the action file had to be re-arranged slightly to ensure the venv is set up before anything from the wheelhouse is imported. Change-Id: Ie913fb5946afdaf1bfb7fd9df8b5d053da82c535 --- rebuild | 2 +- src/actions/run-tempest.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rebuild b/rebuild index 3be1b80..305e2ca 100644 --- a/rebuild +++ b/rebuild @@ -2,4 +2,4 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -a17bf1c0-2152-11e8-b051-135052a09299 +ea22c8e2-cf80-42d4-8416-10b70d85d0f7 diff --git a/src/actions/run-tempest.py b/src/actions/run-tempest.py index e73172c..162d702 100755 --- a/src/actions/run-tempest.py +++ b/src/actions/run-tempest.py @@ -2,16 +2,17 @@ import sys sys.path.append('lib') -import charm.openstack.tempest as tempest -import charms.reactive.relations as relations -import charmhelpers.core.hookenv as hookenv - # Make sure that reactive is bootstrapped and all the states are setup # properly from charms.layer import basic basic.bootstrap_charm_deps() basic.init_config_states() +import charm.openstack.tempest as tempest +import charms.reactive.relations as relations +import charmhelpers.core.hookenv as hookenv + + if __name__ == '__main__': identity_int = relations.endpoint_from_flag('identity-admin.available') if identity_int is None: