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

[fuel.git] / docs / release / userguide / userguide.rst

diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index c6602f3..25b5e13 100644 (file)
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -85,7 +85,7 @@ Network ``PXE/admin``
     During ``MaaS`` commissioning phase, IP addresses are handed out by
     ``MaaS``'s DHCP.
 
-.. NOTE::
+.. WARNING::
 
     Default addresses in below table correspond to a ``PXE/admin`` CIDR of
     ``192.168.11.0/24`` (the usual value used in OPNFV labs).
@@ -157,12 +157,6 @@ Network ``management``
 
     ``management`` often has an IP range offset defined in ``IDF``.
 
-.. NOTE::
-
-    Default addresses in below table correspond to a ``management`` CIDR of
-    ``172.16.10.0/24`` (one of the commonly used values in OPNFV labs).
-    This is defined in ``IDF`` and can easily be changed to something else.
-
 .. WARNING::
 
     Default addresses in below table correspond to a ``management`` IP range of
@@ -177,8 +171,7 @@ Network ``management``
 | ``jumpserver``   | N/A                   | ``172.16.10.1``                 |
 |                  |                       | (manual assignment)             |
 +------------------+-----------------------+---------------------------------+
-| ``cfg01``        | 1st                   | ``172.16.10.2``                 |
-|                  |                       | (IP range ignored for now)      |
+| ``cfg01``        | 1st                   | ``172.16.10.11``                |
 +------------------+-----------------------+---------------------------------+
 | ``mas01``        | 2nd                   | ``172.16.10.12``                |
 +------------------+-----------------------+---------------------------------+
@@ -257,7 +250,7 @@ Network ``internal``
 
     ``internal`` does not usually use an IP range offset in ``IDF``.
 
-.. NOTE::
+.. WARNING::
 
     Default addresses in below table correspond to an ``internal`` CIDR of
     ``10.1.0.0/24`` (the usual value used in OPNFV labs).
@@ -285,12 +278,6 @@ Network ``public``
 
     ``public`` often has an IP range offset defined in ``IDF``.
 
-.. NOTE::
-
-    Default addresses in below table correspond to a ``public`` CIDR of
-    ``172.30.10.0/24`` (one of the used values in OPNFV labs).
-    This is defined in ``IDF`` and can easily be changed to something else.
-
 .. WARNING::
 
     Default addresses in below table correspond to a ``public`` IP range of
@@ -373,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
 =================================================