diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-03 12:51:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-03 12:51:29 +0000 |
| commit | 8cc4a610b6769b57f41801f2885fe3044ee428c2 (patch) | |
| tree | 513806a00a04d68af9a668bd9864c69f71c3dd75 /mcp/scripts | |
| parent | 34d812e03b3e039c69f3b18c098cd924e10551c5 (diff) | |
| parent | cd44087338977d44c91c22938f22473a94622b67 (diff) | |
Merge "[docker] Fix untagged mgmt by default"
Diffstat (limited to 'mcp/scripts')
| -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 }} |