From 26f6c1b15bb2bf83695746768624a36cc092187b Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 20 Jun 2018 16:06:14 +0400
Subject: [noha] Rectify opendaylight+dpdk scenario

Change-Id: Ie707de90617e7080a5eb87cad69a604cf5e0f9fc
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../classes/cluster/mcp-odl-noha/infra/config.yml.j2      |  2 +-
 .../classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'mcp/reclass/classes/cluster/mcp-odl-noha')

diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
index f25dd60fa..9e7dda947 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2
@@ -11,7 +11,7 @@ classes:
   - system.reclass.storage.system.openstack_gateway_single
   - cluster.mcp-common-noha.infra.config
   - cluster.mcp-odl-noha
-  - cluster.all-mcp-arch-common.infra.config{%- if conf.MCP_DPDK_MODE %}_dpdk{%- endif %}_pdf
+  - cluster.all-mcp-arch-common.infra.config_pdf
 parameters:
   reclass:
     storage:
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 c3e79e524..18b73d7ea 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
@@ -37,13 +37,7 @@ parameters:
           netmask: ${_param:opnfv_net_private_mask}
         tenant_interface:
           type: dpdk  # Not a meaningful type, just match 'dpdk' for filtering
-{%- endif %}
-        external_interface:
-          enabled: true
-          type: eth
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
+{%- else %}
         br-mesh:
           enabled: true
           type: bridge
@@ -52,6 +46,13 @@ parameters:
           netmask: ${_param:opnfv_net_private_mask}
           use_interfaces:
             - ${_param:tenant_interface}
+{%- endif %}
+        external_interface:
+          enabled: true
+          type: eth
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
         br-floating:
           enabled: true
           type: ovs_bridge
-- 
cgit 1.2.3-korg