From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 4 Feb 2019 15:03:06 +0000 (+0100)
Subject: [cfg01] Use ssh config to set default user & key
X-Git-Tag: opnfv-8.0.0~43^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F66851%2F1;p=fuel.git

[cfg01] Use ssh config to set default user & key

Change-Id: I7486569568207f7652f8bdfcf1060ce51a9dbb0e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index 5ec63db70..25b5e13be 100644
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -360,9 +360,12 @@ Logging in to cluster nodes is possible from the Jumpserver, Salt Master etc.
     ``/etc/hosts`` on ``cfg01`` has all the cluster hostnames, which can be
     used instead of IP addresses.
 
+    ``/root/.ssh/config`` on ``cfg01`` configures the default user and key:
+    ``ubuntu``, respectively ``/root/fuel/mcp/scripts/mcp.rsa``.
+
 .. code-block:: console
 
-    root@cfg01:~$ ssh -i ~/fuel/mcp/scripts/mcp.rsa ubuntu@ctl01
+    root@cfg01:~$ ssh ctl01
 
 Debugging ``MaaS`` Comissioning/Deployment Issues
 =================================================
diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh
index eb549bc28..9830ea15f 100755
--- a/mcp/scripts/docker-compose/files/entrypoint.sh
+++ b/mcp/scripts/docker-compose/files/entrypoint.sh
@@ -16,6 +16,9 @@ fi
 if [ ! -f /home/ubuntu/.ssh/authorized_keys ]; then
     install -D -o ubuntu /root/fuel/mcp/scripts/mcp.rsa.pub \
                          /home/ubuntu/.ssh/authorized_keys
+    mkdir -p /root/.ssh/
+    echo 'User ubuntu' > /root/.ssh/config
+    echo 'IdentityFile /root/fuel/mcp/scripts/mcp.rsa' >> /root/.ssh/config
 fi
 
 if ! grep -q localhost /etc/hosts; then