From e636eafff79ff05fcaccabcdf8f08200db6acba5 Mon Sep 17 00:00:00 2001 From: josh7810 Date: Tue, 4 Aug 2015 16:06:29 -0500 Subject: [PATCH] Fix ObjectStorage Composite for SAIO Authing * Moved attempted access of composite info to an else statement. This will fix an error if a SAIO is being used since it uses temp auth. Change-Id: I934933e79ebbe52ffb36ad5b4a928848516034fa --- cloudcafe/objectstorage/composites.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudcafe/objectstorage/composites.py b/cloudcafe/objectstorage/composites.py index ff9f61e4..03fbd550 100644 --- a/cloudcafe/objectstorage/composites.py +++ b/cloudcafe/objectstorage/composites.py @@ -27,12 +27,12 @@ class ObjectStorageComposite(object): self.config = ObjectStorageAPIConfig() self.auth_info = self._auth_composite() - self.storage_url = self.auth_info.public_url - self.auth_token = self.auth_info.token_id - if self.auth_info.auth_strategy == 'saio_tempauth': self.storage_url = self.auth_info.access_data.storage_url self.auth_token = self.auth_info.access_data.auth_token + else: + self.storage_url = self.auth_info.public_url + self.auth_token = self.auth_info.token_id self.client = ObjectStorageAPIClient( self.storage_url, self.auth_token)