summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-23 15:11:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-23 15:11:07 +0000
commit01fcac4addbba9276a54845e385c7bcdd8a140df (patch)
treee85e7e409f11ca728a93dba210dfc30adae3470d
parent22028ac4a1518aadf665996de16ca1a4e9f40ccb (diff)
parent9521ac10cb9cd22e6e1ab7c04d8882318ce8ba35 (diff)
Merge "[cfg01] Honor idf.net_config.mgmt.ip-range"
-rw-r--r--docs/release/userguide/userguide.rst3
-rw-r--r--mcp/scripts/docker-compose/docker-compose.yaml.j22
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index 3905dbf14..5ec63db70 100644
--- 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 a3119f92b..8cd9d5deb 100644
--- 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("/") }}