[docker] Fix untagged mgmt by default 01/61701/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 2 Sep 2018 02:40:43 +0000 (04:40 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 2 Sep 2018 02:40:45 +0000 (04:40 +0200)
JIRA: FUEL-383

Change-Id: Ie635965cff3538d6e786f2b76fa4d175d1be1773
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
mcp/scripts/docker-compose/docker-compose.yaml.j2

index 5431597..7099e4f 100644 (file)
@@ -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 }}