launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/decobblerate-authorize-ssh into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/decobblerate-authorize-ssh/+merge/120055

This one turned out to be easy: all the Cobbler mentions were just plain text that referred to the virtual MAAS server as Cobbler.

Fixing anyway because grepping for Cobbler is my main way of finding needed changes, at this point.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/decobblerate-authorize-ssh/+merge/120055
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/decobblerate-authorize-ssh into lp:maas.

=== modified file 'vdenv/bin/authorize-ssh'
--- vdenv/bin/authorize-ssh	2012-03-13 07:52:08 +0000
+++ vdenv/bin/authorize-ssh	2012-08-17 05:37:17 +0000
@@ -2,32 +2,32 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 #
-# Wait for the virtual cobbler instance's ssh server to start up, and set up
+# Wait for the virtual MAAS server's ssh server to start up, and set up
 # passwordless login if desired.
 #
 # Usage:
-#   authorize-ssh <cobbler-ssh-login> <key-owner>
+#   authorize-ssh <server-ssh-login> <key-owner>
 #
 # Where:
-#  * cobbler-ssh-login is an ssh user/hostname, e.g. ubuntu@192.168.123.2
+#  * server-ssh-login is an ssh user/hostname, e.g. ubuntu@192.168.123.2
 #  * key-owner is a Launchpad login name, or * to use local keys, or nothing.
 #
 # If a Launchpad login name is given, import the associated ssh keys into the
-# cobbler instance.  If key-owner is an asterisk, import the local public ssh
-# keys from ~/.ssh/id_*.pub
+# virtual MAAS server.  If key-owner is an asterisk, import the local public
+# ssh keys from ~/.ssh/id_*.pub
 
 # Exit immediately if a command exits with a non-zero status.
 set -o errexit
 # Treat unset variables as an error when substituting.
 set -o nounset
 
-cobblerlogin=$1
+serverlogin=$1
 keyowner=$2
 
 if test -z "$keyowner"
 then
     echo "Not setting up ssh keys."
-    echo "I'll still test a login to Cobbler though."
+    echo "I'll still test a login to the virtual server though."
     inputfiles=/dev/null
     remotecmd="uptime"
 elif test "$keyowner" = "*"
@@ -41,7 +41,7 @@
 fi
 
 while ! cat $inputfiles |
-    ssh $cobblerlogin -o CheckHostIP=no -o StrictHostKeyChecking=no $remotecmd
+    ssh $serverlogin -o CheckHostIP=no -o StrictHostKeyChecking=no $remotecmd
 do
     sleep 5
 done