[lib] Create veths using systemd opnfv-fuel units

Create 2 systemd services on the jumphost that will handle veth
pairs creation, respectively adding them to virsh/real bridges.
This allows us to set docker containers restart policy to 'always',
enabling persistent Salt Master/MaaS containers across jumphost
reboots.

NOTE: libvirt creates virtual networks async, hence the need for
retrying hooking veths to them.

JIRA: FUEL-406

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

1 files changed, 3 insertions, 1 deletions

diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2
index bc8b3e80a..dbac901ca 100644
--- a/mcp/scripts/docker-compose/docker-compose.yaml.j2
+++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2
@@ -14,6 +14,7 @@ services:
   opnfv-fuel-salt-master:
     container_name: "fuel"
     image: "opnfv/fuel:saltmaster-reclass-{{ conf.MCP_DOCKER_TAG }}"
+    restart: always
     networks:
       mcpcontrol:
         ipv4_address: {{ conf.SALT_MASTER }}
@@ -40,6 +41,7 @@ services:
   opnfv-fuel-maas:
     container_name: "maas"
     image: "opnfv/fuel:saltminion-maas-{{ conf.MCP_DOCKER_TAG }}"
+    restart: always
     networks:
       mcpcontrol:
         ipv4_address: {{ conf.MAAS_IP }}
@@ -83,7 +85,7 @@ networks:
     driver: macvlan
     driver_opts:
 {%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) %}
-      parent: {{ ma.interface_str('veth_mcp5', nm.vlan_mgmt) }}
+      parent: {{ ma.interface_str('veth_mcp3', nm.vlan_mgmt) }}
 {%- else %}
       parent: veth_mcp3  # Untagged by default
 {%- endif %}