diff options
| -rw-r--r-- | docs/release/userguide/userguide.rst | 5 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/fdio_repo.yml | 4 | ||||
| -rwxr-xr-x | mcp/scripts/docker-compose/files/entrypoint.sh | 3 | ||||
| m--------- | mcp/scripts/pharos | 0 |
4 files changed, 9 insertions, 3 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/reclass/classes/cluster/all-mcp-arch-common/fdio_repo.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/fdio_repo.yml index d6394a4df..08bc848f2 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/fdio_repo.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/fdio_repo.yml @@ -12,7 +12,7 @@ parameters: linux: system: repo: - fdio.ubuntu: + fdio-ubuntu: # yamllint disable-line rule:line-length source: "deb [trusted=yes] http://nexus.fd.io/content/repositories/fd.io.ubuntu.${_param:linux_system_codename}.main/ ./" pin: @@ -20,7 +20,7 @@ parameters: priority: 1200 package: 'vpp*' # NOTE(armband): For now we define all repos on all archs, let APT figure it out - fdio.ubuntu-arm: + fdio-ubuntu-arm: # yamllint disable-line rule:line-length source: "deb [trusted=yes] http://nexus.fd.io/content/repositories/fd.io.ubuntu-arm.${_param:linux_system_codename}.main/ ./" networking-vpp: 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 diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject 7aa3b0d59d9b0e2935f4eedd78efb7467b29cae +Subproject 917a71636a73cc72098d13ec32e52520cced823 |