aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-11 19:38:41 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-14 12:22:06 +0000
commitbaee79dc7b16db99d0a45235a8dd2c89c0bf28db (patch)
treebe45251b6f53081146a8bf1abc7a13dcedfe0b5f
parentf7597b8289342a7a2d6616b0b3157b5a09750c55 (diff)
[noha] Fix gtw private NIC name in j2 templates
Change-Id: Ic266864913dcac021b3e12f426e1c8a60c23fe87 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 65b4efd8fca25380825af4f165bf51fdd68086db)
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml.j22
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