summaryrefslogtreecommitdiffstats
path: root/docker/storperf-master
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2018-02-05 09:31:21 -0500
committermbeierl <mark.beierl@dell.com>2018-02-05 09:31:21 -0500
commitce8adafbccb4bc37930f95561fa24874906013ad (patch)
tree3c8bee75f2787c95de69819243268a4163ed2cc3 /docker/storperf-master
parent0869c3a314d864d65b2d9faf98653378e411d493 (diff)
Updates for JOID Integration
Changes daily to use the script from JOID to fetch OS information. Adds more environment variables to the OSCreds. Change-Id: I8cc07f82d6cc1bb70987a29947cc4093e8a2ff56 JIRA: STORPERF-238 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'docker/storperf-master')
-rw-r--r--docker/storperf-master/storperf/storperf_master.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py
index da8a05e..f4d41f3 100644
--- a/docker/storperf-master/storperf/storperf_master.py
+++ b/docker/storperf-master/storperf/storperf_master.py
@@ -40,10 +40,17 @@ class StorPerfMaster(object):
name='StorPerfAgentGroup',
template_path='storperf/resources/hot/agent-group.yaml')
- self.os_creds = OSCreds(username=os.environ.get('OS_USERNAME'),
- password=os.environ.get('OS_PASSWORD'),
- auth_url=os.environ.get('OS_AUTH_URL'),
- project_name=os.environ.get('OS_PROJECT_NAME'))
+ self.os_creds = OSCreds(
+ username=os.environ.get('OS_USERNAME'),
+ password=os.environ.get('OS_PASSWORD'),
+ auth_url=os.environ.get('OS_AUTH_URL'),
+ identity_api_version=os.environ.get('OS_IDENTITY_API_VERSION'),
+ user_domain_name=os.environ.get('OS_USER_DOMAIN_NAME'),
+ user_domain_id=os.environ.get('OS_USER_DOMAIN_ID'),
+ region_name=os.environ.get('OS_REGION_NAME'),
+ project_domain_name=os.environ.get('OS_PROJECT_DOMAIN_NAME'),
+ project_domain_id=os.environ.get('OS_PROJECT_DOMAIN_ID'),
+ project_name=os.environ.get('OS_PROJECT_NAME'))
self.heat_stack = OpenStackHeatStack(self.os_creds,
self.stack_settings)
@@ -130,6 +137,8 @@ class StorPerfMaster(object):
if time_since_check.total_seconds() < 30:
return self._cached_stack_id
+ self.logger.debug("OSCreds: %s" % self.os_creds)
+
self.heat_stack.initialize()
if self.heat_stack.get_stack() is not None:
self._last_snaps_check_time = datetime.now()