summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-02-05 07:32:32 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-02-05 07:32:32 +0000
commitad2d9696a3a9dd7602dd0d794a0b722e0b9d3565 (patch)
treee6f6765ff1b2bd10cd1c4aa1a739ceab43355ac8
parent344ff3f741c925d387bbf9f10db0f77455f929da (diff)
parent68594bd6e16253d2f2977a4ab46713386e2482bd (diff)
Merge "[cfg01] Use ssh config to set default user & key"
-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