diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-07 16:28:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-07 16:28:18 +0000 |
| commit | b4d04732d9208082374d3698be846710f4b24933 (patch) | |
| tree | 7993d4db3bcfbc785cbab90fd75b8a6509ba15a2 /docs | |
| parent | 2c7f367480d8d01a486f2f020e77e8898957af74 (diff) | |
| parent | fa202c3a620a2cdb9c686f2547463ffc4a3d2081 (diff) | |
Merge "[docs] Add PXE/admin DHCP warning" into stable/gambia
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/release/installation/installation.instruction.rst | 9 | ||||
| -rw-r--r-- | docs/release/userguide/userguide.rst | 16 |
2 files changed, 10 insertions, 15 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index 40f9d26ae..9dc4aa447 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -147,6 +147,13 @@ installation of ``Gambia`` using Fuel: | | | | | These can be allocated to a single NIC | | | or spread out over multiple NICs. | +| | | +| | .. WARNING:: | +| | | +| | No external ``DHCP`` server should be present | +| | in the ``PXE/admin`` network segment, as it | +| | would interfere with ``MaaS`` ``DHCP`` during | +| | ``baremetal`` node commissioning/deploying. | +------------------+------------------------------------------------------+ | **Power mgmt** | All targets need to have power management tools that | | | allow rebooting the hardware (e.g. ``IPMI``). | @@ -784,7 +791,7 @@ The following parameters are currently supported: +=================================+===========================================+ | ``nova_cpu_pinning`` | List of CPU cores nova will be pinned to. | | | | -| | .. WARNING:: | +| | .. NOTE:: | | | | | | Currently disabled. | +---------------------------------+-------------------------------------------+ diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst index c6602f3cb..3905dbf14 100644 --- 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 @@ -257,7 +251,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 +279,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 |