Backout changes breaking ceph setup.

JIRA: MODELS-23

Change-Id: I8ad85be4f8e06edf768b6695ae349a32cea31578
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/tools/kubernetes/ceph-helm.sh b/tools/kubernetes/ceph-helm.sh
index 280c045..e9a926b 100644
--- a/tools/kubernetes/ceph-helm.sh
+++ b/tools/kubernetes/ceph-helm.sh
@@ -93,8 +93,7 @@ EOF
 
   for node in $nodes; do
     log "install ceph, setup resolv.conf, zap disk for $node"
-    ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-      ubuntu@$node <<EOG
+    ssh -x -o StrictHostKeyChecking=no ubuntu@$node <<EOG
 cat <<EOF | sudo tee /etc/resolv.conf
 nameserver $kubedns
 search ceph.svc.cluster.local svc.cluster.local cluster.local
@@ -104,14 +103,12 @@ sudo apt install -y ceph ceph-common
 sudo ceph-disk zap /dev/$dev
 EOG
     log "Run ceph-osd at $node"
-    name=$(ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-      ubuntu@$node hostname)
+    name=$(ssh -x -o StrictHostKeyChecking=no ubuntu@$node hostname)
     ./helm-install-ceph-osd.sh $name /dev/$dev
   done
 
   for node in $nodes; do
-    name=$(ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-      ubuntu@$node hostname)
+    name=$(ssh -x -o StrictHostKeyChecking=no ubuntu@$node hostname)
     pod=$(kubectl get pods --namespace ceph | awk "/$name/{print \$1}")
     log "verify ceph-osd is Running at node $name"
     status=$(kubectl get pods --namespace ceph $pod | awk "/$pod/ {print \$3}")