diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-11 06:59:03 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-11 17:05:28 +0200 |
| commit | b666bc50b2b8b1bb8cde5cdab280f0409bde4958 (patch) | |
| tree | bcf7e8085096b65c2e5fa5ffc18ecbe7fae7b97f /mcp/scripts/docker-compose | |
| parent | d33f39782f945cae306ce44eead411ff9301a813 (diff) | |
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/docker-compose')
| -rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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: |