overlord: disable ssh forwarding by default
Since the ssh server setup code isn't contain within overlord. Launching
ghost locally will generate a lot of unwanted noise. Let's disable it by
default. We'll enable it once the server setup code is self contained
within overlord. Another options is only enable ssh forwarding on
demand.
BUG=chrome-os-partner:43605
TEST=manually
Change-Id: Id3b00b008663f4207c71acc01018783aa4df2a69
Reviewed-on: https://chromium-review.googlesource.com/300031
Commit-Ready: Wei-Ning Huang <wnhuang@chromium.org>
Tested-by: Wei-Ning Huang <wnhuang@chromium.org>
Reviewed-by: Hsu Wei-Cheng <mojahsu@chromium.org>
diff --git a/py/tools/ghost.py b/py/tools/ghost.py
index 622eb52..093c32e 100755
--- a/py/tools/ghost.py
+++ b/py/tools/ghost.py
@@ -383,8 +383,9 @@
logging.info('Upgrade: initiating upgrade sequence...')
scriptpath = os.path.abspath(sys.argv[0])
- url = 'http%s://%s:%d/upgrade/ghost.py' % ('s' if self.UseSSL() else '',
- self._connected_addr[0], _OVERLORD_HTTP_PORT)
+ url = 'http%s://%s:%d/upgrade/ghost.py' % (
+ 's' if self.UseSSL() else '', self._connected_addr[0],
+ _OVERLORD_HTTP_PORT)
# Download sha1sum for ghost.py for verification
try:
@@ -1180,9 +1181,9 @@
parser.add_argument('--no-rpc-server', dest='rpc_server',
action='store_false', default=True,
help='disable RPC server')
- parser.add_argument('--no-forward-ssh', dest='forward_ssh',
- action='store_false', default=True,
- help='disable target SSH port forwarding')
+ parser.add_argument('--forward-ssh', dest='forward_ssh',
+ action='store_true', default=False,
+ help='enable target SSH port forwarding')
parser.add_argument('--prop-file', metavar='PROP_FILE', dest='prop_file',
type=str, default=None,
help='file containing the JSON representation of client '