From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 2 Sep 2018 02:40:43 +0000 (+0200)
Subject: [docker] Fix untagged mgmt by default
X-Git-Tag: opnfv-7.0.0~66^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cd44087338977d44c91c22938f22473a94622b67;p=fuel.git

[docker] Fix untagged mgmt by default

JIRA: FUEL-383

Change-Id: Ie635965cff3538d6e786f2b76fa4d175d1be1773
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

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 }}