[cfg01] Honor idf.net_config.mgmt.ip-range

Previously, cfg01 mgmt address did not consider the `ip-range` param,
leading to a mismatching `cfg01` entry in /etc/hosts on cluster nodes.

Change-Id: If6f605f4b2817c3751074bef60ebde298bc74b7d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9521ac10cb9cd22e6e1ab7c04d8882318ce8ba35)

diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index 3905dbf..5ec63db 100644 (file)
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -171,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``                |
 +------------------+-----------------------+---------------------------------+

diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2
index a3119f9..8cd9d5d 100644 (file)
--- a/mcp/scripts/docker-compose/docker-compose.yaml.j2
+++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2
@@ -62,4 +62,4 @@ networks:
     ipam:
       config:
         - subnet: {{ nm.net_mgmt }}
-          ip_range: {{ [nm.net_mgmt | ipnet_hostaddr(2), nm.net_mgmt.split("/")[-1]] | join("/") }}
+          ip_range: {{ [nm.net_mgmt | ipnet_hostaddr(nm.start_ip[nm.net_mgmt] + nm.net_mgmt_hosts.index('opnfv_infra_config_address') +1), nm.net_mgmt.split("/")[-1]] | join("/") }}