diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-19 11:27:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-19 11:27:16 +0000 |
| commit | 140f2f31083b58cf7bfd0900c0ad402bb13a7d7e (patch) | |
| tree | 510ebea62d2c8fda9a21a31280fa4a89c672ce2c /mcp/reclass/classes/cluster/mcp-odl-noha/openstack | |
| parent | beab14192ba234803bf2032af6cf190dfa6b25a8 (diff) | |
| parent | 3c1b3b70f0b2ca6a4de2141e9e195366212d2c6b (diff) | |
Merge "Use common way to detect dpdk feature"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/openstack')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 | 2 |
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: |