From 65b4efd8fca25380825af4f165bf51fdd68086db Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 11 Jan 2019 19:38:41 +0100 Subject: [PATCH] [noha] Fix gtw private NIC name in j2 templates Change-Id: Ic266864913dcac021b3e12f426e1c8a60c23fe87 Signed-off-by: Alexandru Avadanii --- mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 | 4 ++-- .../classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 bbd70caa5..58ba34f56 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 @@ -18,7 +18,7 @@ parameters: network: interface: {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %} - {{ nm.cmp001.nic_private }}: + {{ nm.ctl01.nic_private }}: ovs_bridge: br-prv br-prv: enabled: true @@ -36,5 +36,5 @@ parameters: address: ${_param:tenant_address} netmask: ${_param:opnfv_net_private_mask} use_interfaces: - - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} + - {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }} {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 index 2f89ac3f8..8d11eedcd 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j2 @@ -19,7 +19,7 @@ parameters: linux: network: interface: - {{ nm.cmp001.nic_private }}: + {{ nm.ctl01.nic_private }}: ovs_bridge: br-prv br-prv: enabled: true -- 2.16.6