summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-odl-noha
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-19 11:52:15 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-19 11:58:15 +0400
commit3c1b3b70f0b2ca6a4de2141e9e195366212d2c6b (patch)
tree9517f42a000537ff9f73194a8eba14aa21c559af /mcp/reclass/classes/cluster/mcp-odl-noha
parentc57d4c9a8e26c7dcb8f9f1b98c5b5d6d668750a3 (diff)
Use common way to detect dpdk feature
Change-Id: I55a3c10f275079b11b7456b28a2c846cb33c204a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j22
2 files changed, 3 insertions, 3 deletions
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 1c4ee7a19..d57a4b7c1 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
@@ -12,7 +12,7 @@
classes:
- service.neutron.compute.single
- service.neutron.compute.opendaylight.single
-{%- if conf.MCP_DPDK_MODE %}
+{%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
- system.nova.compute.nfv.hugepages
- system.neutron.compute.nfv.dpdk
{%- endif %}
@@ -22,7 +22,7 @@ parameters:
linux:
network:
interface:
-{%- if conf.MCP_DPDK_MODE %}
+{%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
dpdk0:
name: ${_param:dpdk0_name}
pci: ${_param:dpdk0_pci}
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 0a345f42c..bbd70caa5 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
@@ -17,7 +17,7 @@ parameters:
linux:
network:
interface:
-{%- if conf.MCP_DPDK_MODE %}
+{%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
{{ nm.cmp001.nic_private }}:
ovs_bridge: br-prv
br-prv: