MAAS

Merge lp:~smoser/maas/trunk.enlist_minor into lp:~maas-committers/maas/trunk

  1. trunk.enlist_minor
  2. Merge into trunk
Proposed by Scott Moser
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 1024
Proposed branch: lp:~smoser/maas/trunk.enlist_minor
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 16 lines (+4/-1)
1 file modified
contrib/preseeds_v2/enlist_userdata (+4/-1)
To merge this branch: bzr merge lp:~smoser/maas/trunk.enlist_minor
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+125199@code.launchpad.net

Commit message

make the "successful enlistment" message more clear

Description of the change

Simple change, make the "successful enlistment" message more clear

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/preseeds_v2/enlist_userdata'
2--- contrib/preseeds_v2/enlist_userdata 2012-09-07 15:53:57 +0000
3+++ contrib/preseeds_v2/enlist_userdata 2012-09-19 13:25:35 +0000
4@@ -13,8 +13,11 @@
5 [ -n "${ip}" ] && host=$(dig +short -x $ip) && host=${host%.}
6 maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} >/tmp/enlist.out
7 if [ $? -eq 0 ]; then
8+ msg="successfully enlisted to '$url'"
9+ [ -n "$host" ] && msg="$msg with hostname '$host'" ||
10+ msg="$msg without hostname"
11 echo
12- echo "=== $(date -R): successfully enlisted system to $host ==="
13+ echo "=== $(date -R): $msg"
14 cat /tmp/enlist.out
15 echo =============================================
16 sleep 10