Merge "[ovs] Start ovs services before networking"

6 files changed, 17 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 58ba34f56..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
@@ -27,6 +30,8 @@ parameters:
           proto: static
           address: ${_param:tenant_address}
           netmask: ${_param:opnfv_net_private_mask}
+          use_interfaces:
+            - {{ nm.ctl01.nic_private }}
 {%- else %}
         br-mesh:
           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 8d11eedcd..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,8 +20,13 @@ 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
           type: ovs_bridge
           mtu: ${_param:interface_mtu}
+          use_interfaces:
+            - {{ nm.ctl01.nic_private }}