stackforge-attic/murano-docs
Code Issues Proposed changes

Naming conventions: use name instead of id for instance names

Browse Source
This commit is contained in:
Stan Lagun
2013-03-28 12:08:03 +04:00
parent f33bd681ab
commit 9d38355517
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conductor/conductor/app.py
View File

@@ -28,7 +28,7 @@ def task_received(task, message_id):
reporter = reporting.Reporter(rmqclient, message_id, task['id']) reporter = reporting.Reporter(rmqclient, message_id, task['id'])
command_dispatcher = CommandDispatcher( command_dispatcher = CommandDispatcher(
task['id'], rmqclient, task['token'], task['tenant_id']) task['name'], rmqclient, task['token'], task['tenant_id'])
workflows = [] workflows = []
for path in glob.glob("data/workflows/*.xml"): for path in glob.glob("data/workflows/*.xml"):
log.debug('Loading XML {0}'.format(path)) log.debug('Loading XML {0}'.format(path))

2
conductor/conductor/commands/cloud_formation.py
View File

@@ -18,7 +18,7 @@ class HeatExecutor(CommandBase):
def __init__(self, stack, token, tenant_id): def __init__(self, stack, token, tenant_id):
self._update_pending_list = [] self._update_pending_list = []
self._delete_pending_list = [] self._delete_pending_list = []
self._stack = 'e' + stack self._stack = stack
settings = conductor.config.CONF.heat settings = conductor.config.CONF.heat
client = ksclient.Client(endpoint=settings.auth_url) client = ksclient.Client(endpoint=settings.auth_url)

2
conductor/data/workflows/AD.xml
View File

@@ -13,7 +13,7 @@
<update-cf-stack template="Windows"> <update-cf-stack template="Windows">
<parameter name="mappings"> <parameter name="mappings">
<map> <map>
<mapping name="instanceName">AD-<select path="::id"/>-<select path="name"/></mapping> <mapping name="instanceName"><select path="::name"/>-<select path="name"/></mapping>
<mapping name="userData"> <mapping name="userData">
<prepare-user-data> <prepare-user-data>
<parameter name="hostname"><select path="state.hostname"/></parameter> <parameter name="hostname"><select path="state.hostname"/></parameter>

2
conductor/data/workflows/IIS.xml
View File

@@ -13,7 +13,7 @@
<update-cf-stack template="Windows"> <update-cf-stack template="Windows">
<parameter name="mappings"> <parameter name="mappings">
<map> <map>
<mapping name="instanceName">WS-<select path="::id"/>-<select path="name"/></mapping> <mapping name="instanceName">WS-<select path="::name"/>-<select path="name"/></mapping>
<mapping name="userData"> <mapping name="userData">
<prepare-user-data> <prepare-user-data>
<parameter name="hostname"><select path="state.hostname"/></parameter> <parameter name="hostname"><select path="state.hostname"/></parameter>