From 510fced443b454b6cab33eda14a3f6ad197cf46a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 20 Nov 2018 22:13:27 +0200 Subject: [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 (cherry picked from commit 9521ac10cb9cd22e6e1ab7c04d8882318ce8ba35) --- docs/release/userguide/userguide.rst | 3 +-- mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 +- 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("/") }} -- cgit 1.2.3-korg