From b666bc50b2b8b1bb8cde5cdab280f0409bde4958 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 11 Sep 2018 06:59:03 +0200 Subject: [cleanup] FN VMs: Fold user-data templates While at it, retire obsolete MAAS_IP global variable and let mas01 VM get a DHCP address from virsh-managed mcpcontrol network. Change-Id: Ifd85dbcab10894a5d0d675d37f0c35f09776d9b4 Signed-off-by: Alexandru Avadanii --- mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/scripts/docker-compose') diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index ed0400da5..7cd845511 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -40,7 +40,7 @@ networks: config: - subnet: {{ net_mcpcontrol }} gateway: {{ net_mcpcontrol | ipnet_hostaddr(1) }} - ip_range: {{ [net_mcpcontrol | ipnet_hostaddr(2), conf.MCPCONTROL_PREFIX] | join("/") }} + ip_range: {{ [conf.SALT_MASTER, conf.MCPCONTROL_PREFIX] | join("/") }} pxebr: driver: macvlan driver_opts: -- cgit 1.2.3-korg