From 3b9ebcfe78a6db0adad990dd2ee3fbe09eee8e82 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 4 May 2018 17:24:19 +0200
Subject: [PATCH] addhost update from eduid

---
 addhost | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/addhost b/addhost
index 3511e18e..92f9b98e 100755
--- a/addhost
+++ b/addhost
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 cmd_hostname=""
 cmd_do_bootstrap="no"
@@ -49,14 +49,9 @@ if [ ! -d $cmd_hostname ]; then
    ./bump-tag
 fi
 
-SSH_ARGS=""
-if [ "x${COSMOS_JUMPHOST}" != "x" ]; then
-   SSH_ARGS="$SSH_ARGS -o \"ProxyCommand ssh root@${COSMOS_JUMPHOST} -W %h:%p\""
-fi
-
 if [ "$cmd_do_bootstrap" = "yes" ]; then
-   scp "$SSH_ARGS" apt/cosmos_1.5-1_all.deb apt/bootstrap-cosmos.sh root@$cmd_hostname:
-   ssh "$SSH_ARGS" root@$cmd_hostname ./bootstrap-cosmos.sh $cmd_fqdn $rrepo $rtag
-   ssh root@$cmd_hostname cosmos update 
-   ssh root@$cmd_hostname cosmos apply
+   scp apt/cosmos_1.5-1_all.deb apt/bootstrap-cosmos.sh root@$cmd_hostname:
+   ssh root@$cmd_hostname ./bootstrap-cosmos.sh $cmd_fqdn $rrepo $rtag
+   ssh root@$cmd_hostname cosmos -v update 
+   ssh root@$cmd_hostname cosmos -v apply
 fi