aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-04 16:03:06 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-04 16:03:06 +0100
commit68594bd6e16253d2f2977a4ab46713386e2482bd (patch)
tree144cf8466f709f8ac2947d7f03401aeecb5c9a93
parentc2ea7deba73e335ace30eba1db7e2f80d3c1daed (diff)
[cfg01] Use ssh config to set default user & key
Change-Id: I7486569568207f7652f8bdfcf1060ce51a9dbb0e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--docs/release/userguide/userguide.rst5
-rwxr-xr-xmcp/scripts/docker-compose/files/entrypoint.sh3
2 files changed, 7 insertions, 1 deletions
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