commit 0cebb02ba60c427764c357b1d2221fe7b3984520
author Andy Bavier <andy@onlab.us> Tue Nov 14 10:22:50 2017 -0700
committer Andy Bavier <andy@opennetworking.org> Tue Nov 14 15:59:32 2017 -0700
tree baaabf520143800975ec338bd058b7d90a2f5895
parent bcbe8cefed33cd0fc251bf6922d1850c3e15bc7b

CORD-2256 Enable SSH password login in synchronizers

Change-Id: I7fec4abe8d65184e9016c8c372ce2d7b06da5c3c
(cherry picked from commit be9649ef1eeb94ac3b675872a883188eb81eea1f)

containers/xos/Dockerfile.base

diff --git a/containers/xos/Dockerfile.base b/containers/xos/Dockerfile.base
index 4e12718..2d5582e 100644
--- a/containers/xos/Dockerfile.base
+++ b/containers/xos/Dockerfile.base
@@ -42,6 +42,7 @@
     python-pip \
     rsync \
     software-properties-common \
+    sshpass \
     supervisor \
     unzip \
     wget \

xos/synchronizers/new_base/ansible_helper.py

diff --git a/xos/synchronizers/new_base/ansible_helper.py b/xos/synchronizers/new_base/ansible_helper.py
index d437c93..210fa6d 100644
--- a/xos/synchronizers/new_base/ansible_helper.py
+++ b/xos/synchronizers/new_base/ansible_helper.py
@@ -255,11 +255,7 @@
 
     f = open(hosts_pathname, "w")
     f.write("[%s]\n" % instance_name)
-    if proxy_ssh or baremetal_ssh:
-        f.write("%s ansible_ssh_private_key_file=%s\n" % (hostname, private_key_pathname))
-    else:
-        # acb: Login user is hardcoded, this is not great
-        f.write("%s ansible_ssh_private_key_file=%s ansible_ssh_user=ubuntu\n" % (ssh_ip, private_key_pathname))
+    f.write("%s ansible_ssh_private_key_file=%s\n" % (ssh_ip, private_key_pathname))
     f.close()
 
     # SSH will complain if private key is world or group readable