diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-02 04:40:43 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-02 04:40:45 +0200 |
| commit | cd44087338977d44c91c22938f22473a94622b67 (patch) | |
| tree | cb4b4c5b37dec4e9c5ec7f9ac121e729fe5cc850 /mcp/scripts/docker-compose | |
| parent | c4d91eca1ba1614648fb2ae96340ed2876f64cd3 (diff) | |
[docker] Fix untagged mgmt by default
JIRA: FUEL-383
Change-Id: Ie635965cff3538d6e786f2b76fa4d175d1be1773
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index 54315978e..7099e4fda 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -52,7 +52,11 @@ networks: mgmt: driver: macvlan driver_opts: +{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) %} parent: {{ ma.interface_str('veth_mcp5', nm.vlan_mgmt) }} +{%- else %} + parent: veth_mcp5 # Untagged by default +{%- endif %} ipam: config: - subnet: {{ nm.net_mgmt }} |