diff --git a/timmy/env.py b/timmy/env.py index 4979371..7121db3 100644 --- a/timmy/env.py +++ b/timmy/env.py @@ -16,7 +16,7 @@ # under the License. project_name = 'timmy' -version = '1.17.1' +version = '1.17.2' if __name__ == '__main__': import sys diff --git a/timmy/nodes.py b/timmy/nodes.py index c28aa13..bc80f18 100644 --- a/timmy/nodes.py +++ b/timmy/nodes.py @@ -694,26 +694,26 @@ class NodeManager(object): if self.token: return True v2_body = ('{"auth": {"tenantName": "%s", "passwordCredentials": {' - '"username": "%s", "password": "%s"}}}') + '"username": "%s", "password": "%s"}}}') # v3 not fully implemented yet - v3_body = ('{ "auth": {' - ' "scope": {' - ' "project": {' - ' "name": "%s",' - ' "domain": { "id": "default" }' - ' }' - ' },' - ' "identity": {' - ' "methods": ["password"],' - ' "password": {' - ' "user": {' - ' "name": "%s",' - ' "domain": { "id": "default" },' - ' "password": "%s"' - ' }' - ' }' - ' }' - '}}') + # v3_body = ('{ "auth": {' + # ' "scope": {' + # ' "project": {' + # ' "name": "%s",' + # ' "domain": { "id": "default" }' + # ' }' + # ' },' + # ' "identity": {' + # ' "methods": ["password"],' + # ' "password": {' + # ' "user": {' + # ' "name": "%s",' + # ' "domain": { "id": "default" },' + # ' "password": "%s"' + # ' }' + # ' }' + # ' }' + # '}}') # Sticking to v2 API for now because Fuel 9.1 has a custom # domain_id defined in keystone.conf which we do not know. req_data = v2_body % (self.conf['fuel_tenant'], @@ -724,7 +724,7 @@ class NodeManager(object): self.conf['fuel_keystone_port']), req_data, {'Content-Type': 'application/json'}) try: - ### Disabling v3 token retrieval for now + # Disabling v3 token retrieval for now # token = urllib2.urlopen(req).info().getheader('X-Subject-Token') result = urllib2.urlopen(req) resp_body = result.read()