Pass in endpoint url for quantum auth_token auth

This aligns quantum auth_token only authentication with the
way Horizon does it.

Tested by launching a stack with and without the --token-only flag

Also tested using Horizon, which is auth_token only

Part of blueprint auth-token-only

Change-Id: Ic6d471de527951415ef4858cbbff27cf60561924

diff --git a/heat/engine/clients.py b/heat/engine/clients.py
index dd9560c208d81840a7c2d99e2bc84a9a86322d08..b5781f813ceb05e31771c185e0ed616f615c80db 100644 (file)
--- a/heat/engine/clients.py
+++ b/heat/engine/clients.py
@@ -160,10 +160,8 @@ class OpenStackClients(object):
             args['password'] = con.password
             args['tenant_name'] = con.tenant
         elif con.auth_token is not None:
-            args['username'] = con.service_user
-            args['password'] = con.service_password
-            args['tenant_name'] = con.service_tenant
             args['token'] = con.auth_token
+            args['endpoint_url'] = self.url_for(service_type='network')
         else:
             logger.error("Quantum connection failed, "
                          "no password or auth_token!")