x/timmy
Code Issues Proposed changes

fix: flake8 warnings

Browse Source
This commit is contained in:
Aleksandr Dobdin 2016-08-25 05:39:53 +00:00
parent c2be453fa9
commit 8ee11507c9
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.17.1' version = '1.17.2'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

38
timmy/nodes.py
View File

@ -696,24 +696,24 @@ class NodeManager(object):
v2_body = ('{"auth": {"tenantName": "%s", "passwordCredentials": {' v2_body = ('{"auth": {"tenantName": "%s", "passwordCredentials": {'
'"username": "%s", "password": "%s"}}}') '"username": "%s", "password": "%s"}}}')
# v3 not fully implemented yet # v3 not fully implemented yet
v3_body = ('{ "auth": {' # v3_body = ('{ "auth": {'
' "scope": {' # ' "scope": {'
' "project": {' # ' "project": {'
' "name": "%s",' # ' "name": "%s",'
' "domain": { "id": "default" }' # ' "domain": { "id": "default" }'
' }' # ' }'
' },' # ' },'
' "identity": {' # ' "identity": {'
' "methods": ["password"],' # ' "methods": ["password"],'
' "password": {' # ' "password": {'
' "user": {' # ' "user": {'
' "name": "%s",' # ' "name": "%s",'
' "domain": { "id": "default" },' # ' "domain": { "id": "default" },'
' "password": "%s"' # ' "password": "%s"'
' }' # ' }'
' }' # ' }'
' }' # ' }'
'}}') # '}}')
# Sticking to v2 API for now because Fuel 9.1 has a custom # Sticking to v2 API for now because Fuel 9.1 has a custom
# domain_id defined in keystone.conf which we do not know. # domain_id defined in keystone.conf which we do not know.
req_data = v2_body % (self.conf['fuel_tenant'], req_data = v2_body % (self.conf['fuel_tenant'],
@ -724,7 +724,7 @@ class NodeManager(object):
self.conf['fuel_keystone_port']), req_data, self.conf['fuel_keystone_port']), req_data,
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})
try: try:
### Disabling v3 token retrieval for now # Disabling v3 token retrieval for now
# token = urllib2.urlopen(req).info().getheader('X-Subject-Token') # token = urllib2.urlopen(req).info().getheader('X-Subject-Token')
result = urllib2.urlopen(req) result = urllib2.urlopen(req)
resp_body = result.read() resp_body = result.read()