aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/scripts/docker-compose
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-28 18:11:20 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-29 19:33:33 +0000
commit904183e275ca6b2aa6cad11a330fc060d5379b3e (patch)
tree58a799d83ac35be7317c80afebcbfae198feb560 /mcp/scripts/docker-compose
parentcee4e0ca227509ea8386934a15f748b8077f4e18 (diff)
[docker] compose: Switch ip_range to ipv4_address
Explicitly set the ipv4_address for each network instead of relying on ip_range allocation, which seems to fail / not be picked up. While at it, use docker-compose 1.22 or newer to bypass slow Docker network creation with 'macvlan' driver [1]. [1] https://github.com/docker/compose/issues/5248 Change-Id: Ic31851522576ebb2407d869b7c3ed7bd06951922 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.j212
1 files changed, 6 insertions, 6 deletions
diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2
index 8cd9d5deb..891d55938 100644
--- a/mcp/scripts/docker-compose/docker-compose.yaml.j2
+++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2
@@ -15,9 +15,12 @@ services:
container_name: "fuel"
image: "opnfv/fuel:saltmaster-reclass-{{ conf.MCP_DOCKER_TAG }}"
networks:
- - mcpcontrol
- - pxebr
- - mgmt
+ mcpcontrol:
+ ipv4_address: {{ conf.SALT_MASTER }}
+ pxebr:
+ ipv4_address: {{ nm.net_admin | ipnet_hostaddr(nm.start_ip[nm.net_admin] + nm.net_admin_hosts.index('opnfv_infra_config_pxe_admin_address') +1) }}
+ mgmt:
+ ipv4_address: {{ nm.net_mgmt | ipnet_hostaddr(nm.start_ip[nm.net_mgmt] + nm.net_mgmt_hosts.index('opnfv_infra_config_address') +1) }}
volumes:
- /run/dbus/system_bus_socket:/run/dbus/system_bus_socket:ro
- {{ conf.MCP_REPO_ROOT_PATH }}:/root/fuel
@@ -42,7 +45,6 @@ networks:
config:
- subnet: {{ net_mcpcontrol }}
gateway: {{ net_mcpcontrol | ipnet_hostaddr(1) }}
- ip_range: {{ [conf.SALT_MASTER, conf.MCPCONTROL_PREFIX] | join("/") }}
pxebr:
driver: macvlan
driver_opts:
@@ -50,7 +52,6 @@ networks:
ipam:
config:
- subnet: {{ nm.net_admin }}
- ip_range: {{ [nm.net_admin | ipnet_hostaddr(nm.start_ip[nm.net_admin] + nm.net_admin_hosts.index('opnfv_infra_config_pxe_admin_address') +1), nm.net_admin.split("/")[-1]] | join("/") }}
mgmt:
driver: macvlan
driver_opts:
@@ -62,4 +63,3 @@ networks:
ipam:
config:
- subnet: {{ nm.net_mgmt }}
- 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("/") }}