[ovs] Start ovs services before networking

Fix broken systemd service unit dependecies:
- OVS should start before networking service;
- OVS ports & bridges should not be automatically ifup-ed by
  networking service to avoid races, so drop 'auto' for both
  (OVS ports are automatically handled when part of an OVS bridge);
- explicitly ifup OVS bridges as part of networking service, but
  after all Linux interfaces have been handled;
- use 'allow-ovs br-prv' to let OVS handle br-prv and avoid another
  race condition;

While at it, fix some other related issues:
- make OVS service start after DPDK service (if present);
- bump OVS-DPDK compute VMs RAM since since switching from MTU 1500
  to jumbo frames for virtual PODs a while ago failed to do so [1];
- avoid creating conflicting reclass linux.network.interfaces entries
  for OVS ports by using their name (drop 'ovs_port_' prefix):
  * for untagged networks they will override existing common defs;
  * for tagged networks, they will create separate entries;
- DPDK scenarios: make gtw01 br-prv members OVS ports to avoid race
  conditions after node reboot by letting OVS handle them;

[1] https://developers.redhat.com/blog/2018/03/16/\
    ovs-dpdk-hugepage-memory/

Change-Id: I0266ba67f3849b6f7e331a758146b331730bae55
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry-picked from commit ac7fd699468ad9a02b250e5ef890aff8a03ce1bf)

6 files changed, 13 insertions, 8 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
index f1b369c66..de0177a04 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
@@ -42,6 +42,9 @@ parameters:
 {%- if nm.cmp001.nic_admin in nics %}
   {%- do nics.pop(nm.cmp001.nic_admin) %}
 {%- endif %}
+{%- if ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) in nics %}
+  {%- do nics.pop(nm.cmp001.nic_public) %}
+{%- endif %}
 
 {{ ma.linux_network_interfaces_nic(nics) }}
 
@@ -67,9 +70,8 @@ parameters:
           gateway: ${_param:opnfv_net_public_gw}
           name_servers: {{ nm.dns_public }}
           noifupdown: true
-        ovs_port_{{ nm.cmp001.nic_public }}:
+        {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}:
           enabled: true
-          name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
           proto: manual
           ovs_port_type: OVSPort
           type: ovs_port
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
index d2003d235..23f4ed638 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
@@ -60,9 +60,8 @@ parameters:
 {{ ma.linux_network_interfaces_vlan(vlans) }}
 
 {%- if '-fdio-' not in conf.MCP_DEPLOY_SCENARIO %}
-        ovs_port_{{ nm.ctl01.nic_public }}:
+        {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }}:
           enabled: true
-          name: {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }}
           mtu: ${_param:interface_mtu}
           proto: manual
           ovs_port_type: OVSPort
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index 5d8d26a1a..969c9347f 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -80,9 +80,8 @@ parameters:
           netmask: ${_param:opnfv_net_private_mask}
           use_interfaces:
             - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
-        ovs_port_{{ nm.cmp001.nic_public }}:
+        {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}:
           enabled: true
-          name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
           mtu: ${_param:interface_mtu}
           proto: manual
           ovs_port_type: OVSPort
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
index c7272ffe8..93313adc7 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
@@ -19,6 +19,9 @@ parameters:
       interface:
 {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
         {{ nm.ctl01.nic_private }}:
+          ovs_port_type: OVSPort
+          type: ovs_port
+          bridge: br-prv
           ovs_bridge: br-prv
         br-prv:
           enabled: true
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
index da1b98865..ec6a1e7d3 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2
@@ -21,9 +21,8 @@ parameters:
   linux:
     network:
       interface:
-        ovs_port_{{ nm.cmp001.nic_public }}:
+        {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}:
           enabled: true
-          name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
           mtu: ${_param:interface_mtu}
           proto: manual
           ovs_port_type: OVSPort
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2
index 3ec0c8234..c45b75569 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2
@@ -20,6 +20,9 @@ parameters:
     network:
       interface:
         {{ nm.ctl01.nic_private }}:
+          ovs_port_type: OVSPort
+          type: ovs_port
+          bridge: br-prv
           ovs_bridge: br-prv
         br-prv:
           enabled: true