summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 21:22:36 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 21:22:36 +0000
commite77368b2351154cf92b23532f221bf6b9ea30f19 (patch)
tree1d89bf8907f2dd90b221ac478bf0c288adf92836
parenta4e6956f8db98c57cfb06cff692202055d04aee5 (diff)
parenta05e4510bfedae82d7f791a23acf217ef506443e (diff)
Merge "Fix plan export"
-rw-r--r--tripleo_common/actions/plan.py2
-rw-r--r--tripleo_common/actions/swifthelper.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tripleo_common/actions/plan.py b/tripleo_common/actions/plan.py
index 510fb0b..5fd242a 100644
--- a/tripleo_common/actions/plan.py
+++ b/tripleo_common/actions/plan.py
@@ -255,7 +255,7 @@ class ExportPlanAction(base.TripleOAction):
255 headers=headers) 255 headers=headers)
256 256
257 def run(self, context): 257 def run(self, context):
258 swift = self.get_object_client() 258 swift = self.get_object_client(context)
259 tmp_dir = tempfile.mkdtemp() 259 tmp_dir = tempfile.mkdtemp()
260 260
261 try: 261 try:
diff --git a/tripleo_common/actions/swifthelper.py b/tripleo_common/actions/swifthelper.py
index f3876f4..c1b1c88 100644
--- a/tripleo_common/actions/swifthelper.py
+++ b/tripleo_common/actions/swifthelper.py
@@ -36,7 +36,7 @@ class SwiftInformationAction(base.TripleOAction):
36 data = None 36 data = None
37 error = None 37 error = None
38 try: 38 try:
39 oc = self.get_object_client() 39 oc = self.get_object_client(context)
40 oc.head_container(self.container) 40 oc.head_container(self.container)
41 container_url = "{}/{}".format(oc.url, self.container) 41 container_url = "{}/{}".format(oc.url, self.container)
42 auth_key = context.auth_token 42 auth_key = context.auth_token