Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/1.1-backport-1024 into
lp:maas/12.04-nocobbler.
Commit message:
Backport trunk r1024: clearer message on successful enlistment.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~jtv/maas/1.1-backport-1024/+merge/130724
This has been in use in trunk for some time. Backporting it required no changes.
Jeroen
--
https://code.launchpad.net/~jtv/maas/1.1-backport-1024/+merge/130724
Your team MAAS Maintainers is subscribed to branch lp:maas/12.04-nocobbler.
=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata 2012-09-07 15:53:57 +0000
+++ contrib/preseeds_v2/enlist_userdata 2012-10-22 03:43:20 +0000
@@ -13,8 +13,11 @@
[ -n "${ip}" ] && host=$(dig +short -x $ip) && host=${host%.}
maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} >/tmp/enlist.out
if [ $? -eq 0 ]; then
+ msg="successfully enlisted to '$url'"
+ [ -n "$host" ] && msg="$msg with hostname '$host'" ||
+ msg="$msg without hostname"
echo
- echo "=== $(date -R): successfully enlisted system to $host ==="
+ echo "=== $(date -R): $msg"
cat /tmp/enlist.out
echo =============================================
sleep 10
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
