From cd44087338977d44c91c22938f22473a94622b67 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 2 Sep 2018 04:40:43 +0200
Subject: [docker] Fix untagged mgmt by default

JIRA: FUEL-383

Change-Id: Ie635965cff3538d6e786f2b76fa4d175d1be1773
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 mcp/scripts/docker-compose/docker-compose.yaml.j2 | 4 ++++
 1 file changed, 4 insertions(+)

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 }}
-- 
cgit 1.2.3-korg