commit ee86c1d76d5c75c6c4b4dee79698f5f49034a145
author Jenkins <jenkins@review.openstack.org> Sat Mar 03 00:45:01 2012 +0000
committer Gerrit Code Review <review@openstack.org> Sat Mar 03 00:45:01 2012 +0000
tree 52768c88c527e8ff0dd4970dafcf55b032c6303c
parent 4b10c7cc7181d0b097b2956a6eaabb5cd35d7348
parent 37b32b6971dc519e745c958f6af3393502434545

Merge "Fixes bug 902352 – New tests for security groups"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 097cfb9..7f39118 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -11,6 +11,12 @@
 build_timeout=600
 catalog_type=compute
 
+[image]
+username=admin
+password=********
+tenant=admin
+auth_url=http://localhost:5000/v2.0
+
 [environment]
 image_ref=3
 image_ref_alt=4

tempest/services/image/service.py

diff --git a/tempest/services/image/service.py b/tempest/services/image/service.py
index efeacb3..2cf053f 100644
--- a/tempest/services/image/service.py
+++ b/tempest/services/image/service.py
@@ -49,7 +49,8 @@
             service_token = config.images.service_token
             self._client = client.Client(config.images.host,
                                          config.images.port,
-                                         auth_tok=service_token)
+                                         auth_tok=service_token,
+                                         creds=creds)
         else:
             raise NotImplementedError