commit 564b2adf1ef5ed73c529a9fabdc1c74553f2a48d
author Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> Thu Jan 22 02:08:59 2015 +0000
committer Ken'ichi Ohmichi <ken1ohmichi@gmail.com> Tue Feb 03 02:04:47 2015 +0000
tree cbc8da3072aeee390d4c7146d6af7002081deaba
parent cd739654b2cfa16d2287f6c1710da2d703e2e1fa

Remove CONF values from object_storage clients

To move object_storage clients to tempest-lib, this patch moves
CONF values from object_storage clients to the client setting.

Change-Id: I0fabc1036bcf8ce2e96ac946a6fe1d67deee140d

tempest/cmd/javelin.py

diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index e5ffb1b..1591c59 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -159,6 +159,13 @@
         }
         compute_params.update(default_params)
 
+        object_storage_params = {
+            'service': CONF.object_storage.catalog_type,
+            'region': CONF.object_storage.region or CONF.identity.region,
+            'endpoint_type': CONF.object_storage.endpoint_type
+        }
+        object_storage_params.update(default_params)
+
         _creds = tempest.auth.KeystoneV2Credentials(
             username=user,
             password=pw,
@@ -171,8 +178,10 @@
                                                         **compute_params)
         self.secgroups = security_groups_client.SecurityGroupsClientJSON(
             _auth, **compute_params)
-        self.objects = object_client.ObjectClient(_auth)
-        self.containers = container_client.ContainerClient(_auth)
+        self.objects = object_client.ObjectClient(_auth,
+                                                  **object_storage_params)
+        self.containers = container_client.ContainerClient(
+            _auth, **object_storage_params)
         self.images = image_client.ImageClientV2JSON(_auth)
         self.telemetry = telemetry_client.TelemetryClientJSON(_auth)
         self.volumes = volumes_client.VolumesClientJSON(_auth)