stackforge-attic/murano-conductor
Code Issues Proposed changes

Merge "ValueError when joining external AD"

Browse Source
This commit is contained in:
Jenkins 2013-07-18 17:58:51 +00:00 committed by Gerrit Code Review
commit 89e478ad6a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/workflows/AD.xml
View File

@ -173,7 +173,7 @@
</set> </set>
<report entity="unit"> <report entity="unit">
<parameter name="id"><select path="id" source="unit"/></parameter> <parameter name="id"><select path="id" source="unit"/></parameter>
<parameter name="text">Unit <select path="state.hostname" source="unit"/> <select path="name" source="unit"/> has joined domain <select path="domain"/></parameter> <parameter name="text">Unit <select path="state.hostname" source="unit"/> (<select path="name" source="unit"/>) has joined domain <select path="domain"/></parameter>
</report> </report>
</success> </success>
</send-command> </send-command>

4
data/workflows/ExternalAD.xml.example
View File

@ -73,8 +73,8 @@
<select path="domain" source="ad"/> <select path="domain" source="ad"/>
</set> </set>
<report entity="unit"> <report entity="unit">
<parameter name="id"><select path="id" source="unit"/></parameter> <parameter name="id"><select path="id"/></parameter>
<parameter name="text">Unit <select path="state.hostname"/> <select path="name"/> has joined domain <select path="domain" source="ad"/></parameter> <parameter name="text">Unit <select path="state.hostname"/> (<select path="name"/>) has joined domain <select path="domain" source="ad"/></parameter>
</report> </report>
</success> </success>
</send-command> </send-command>