commit 415447a25f175f2a50cfaaa06a95135f617fc336
author Yulia Portnova <yportnova@mirantis.com> Tue May 12 15:09:21 2015 +0300
committer Yulia Portnova <yportnova@mirantis.com> Tue May 12 15:10:19 2015 +0300
tree 2fa9e0462f4b9a66ff44917db1c2cc05a5cb135b
parent b9499ad3b34e62b8b4a1b43304d78b46377131e9

Fixed getting os_auth_url

wally/fuel_rest_api.py

diff --git a/wally/fuel_rest_api.py b/wally/fuel_rest_api.py
index 737bf2e..621e637 100644
--- a/wally/fuel_rest_api.py
+++ b/wally/fuel_rest_api.py
@@ -314,7 +314,7 @@
     delete = DELETE('api/clusters/{id}')
     get_tasks_status = GET("api/tasks?cluster_id={id}")
     get_networks = GET(
-        'api/clusters/{id}/network_configuration/{net_provider}')
+        'api/clusters/{id}/network_configuration/neutron')
 
     get_attributes = GET(
         'api/clusters/{id}/attributes')
@@ -349,12 +349,7 @@
         creds['username'] = access['user']['value']
         creds['password'] = access['password']['value']
         creds['tenant_name'] = access['tenant']['value']
-        if self.nodes.controller:
-            contr = self.nodes.controller[0]
-            creds['os_auth_url'] = "http://%s:5000/v2.0" \
-                % contr.get_ip(network="public")
-        else:
-            creds['os_auth_url'] = ""
+        creds['os_auth_url'] = self.get_networks()['public_vip']
         return creds
 
     def get_nodes(self):