diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-17 12:51:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-17 12:51:05 +0000 |
| commit | ce006d7e483ae07279f0c036616d8896f18f7000 (patch) | |
| tree | 383cd5e25aa8ec21b01aa6e40e79e93ecf77c4a9 /mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha | |
| parent | c2902b924da9b2246ec80e7b541950b26ebc8cde (diff) | |
| parent | 2a1201f80fe5800ffbdf71917eddfeb3a5f6c4c1 (diff) | |
Merge "[noha] Parameterize network configuration"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml) | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 index 3e4eeceab..df2911104 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 @@ -37,5 +37,5 @@ parameters: br-prv: enabled: true type: dpdk_ovs_bridge - tenant_interface: + {{ nm.cmp001.nic_private }}: type: dpdk # Not a meaningful type, just match 'dpdk' for filtering diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 index 2f9aee6fd..2f89ac3f8 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 @@ -5,6 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +{%- import 'net_map.j2' as nm with context %} --- classes: - cluster.mcp-common-noha.openstack_gateway @@ -18,7 +19,7 @@ parameters: linux: network: interface: - tenant_interface: + {{ nm.cmp001.nic_private }}: ovs_bridge: br-prv br-prv: enabled: true |