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-common-noha | |
| parent | beab14192ba234803bf2032af6cf190dfa6b25a8 (diff) | |
| parent | 3c1b3b70f0b2ca6a4de2141e9e195366212d2c6b (diff) | |
Merge "Use common way to detect dpdk feature"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 index aceb54461..20f9b3c1e 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 @@ -11,7 +11,7 @@ {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.cmp001.nic_mgmt: True, nm.cmp001.nic_private: True } %} {%- set vlans = { nm.vlan_mgmt: nm.cmp001.nic_mgmt } %} -{%- if 'dpdk' not in conf.cluster.domain and not conf.MCP_DPDK_MODE %} +{%- if '-ovs-' not in conf.MCP_DEPLOY_SCENARIO %} {%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} {%- do vlans.update({ vlan_private_start: nm.cmp001.nic_private }) %} {%- endif %} 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 b05290480..bd62ae990 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 @@ -11,7 +11,7 @@ {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.ctl01.nic_mgmt: True, nm.ctl01.nic_private: True } %} {%- set vlans = { nm.vlan_mgmt: nm.ctl01.nic_mgmt } %} -{%- if 'dpdk' not in conf.cluster.domain and not conf.MCP_DPDK_MODE %} +{%- if '-ovs-' not in conf.MCP_DEPLOY_SCENARIO %} {%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} {%- do vlans.update({ vlan_private_start: nm.ctl01.nic_private }) %} {%- endif %} |