stackforge-attic/murano-conductor
Code Issues Proposed changes

Merge "#KEERO-222 Remove random part of unit name"

Browse Source
This commit is contained in:
Stanislav Lagun 2013-03-26 13:53:01 +04:00 committed by Gerrit Code Review
commit e6c30e4072
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
portas/portas/api/v1/active_directories.py
View File

@ -38,8 +38,7 @@ class Controller(object):
for unit in active_directory['units']:
unit_count += 1
unit['id'] = uuidutils.generate_uuid()
unit['name'] = 'dc{0}{1}'.format(unit_count,
active_directory['id'][:4])
unit['name'] = 'dc{0}'.format(unit_count)
draft = prepare_draft(draft)
draft['services']['activeDirectories'].append(active_directory)

2
portas/portas/api/v1/webservers.py
View File

@ -36,7 +36,7 @@ class Controller(object):
for unit in webServer['units']:
unit_count += 1
unit['id'] = uuidutils.generate_uuid()
unit['name'] = 'iis{0}{1}'.format(unit_count, webServer['id'][:3])
unit['name'] = 'iis{0}'.format(unit_count)
draft = prepare_draft(draft)
draft['services']['webServers'].append(webServer)