Merge "Naming conventions: use name instead of id for instance names" into iteration4

conductor/conductor/app.py

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

conductor/conductor/commands/cloud_formation.py

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

conductor/data/workflows/AD.xml

@@ -13,7 +13,7 @@
 		<update-cf-stack template="Windows">
 			<parameter name="mappings">
 				<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">
 						<prepare-user-data>
 							<parameter name="hostname"><select path="state.hostname"/></parameter>

conductor/data/workflows/IIS.xml

@@ -13,7 +13,7 @@
 		<update-cf-stack template="Windows">
 			<parameter name="mappings">
 				<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">
 						<prepare-user-data>
 							<parameter name="hostname"><select path="state.hostname"/></parameter>