Merge "[cfg01] Honor idf.net_config.mgmt.ip-range" into stable/gambia

opnfv · Nov 28, 2018 · 6ca6454 · 6ca6454
2 parents e9b01df + 510fced
commit 6ca6454
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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("/") }}