aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-14 08:46:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-14 08:46:11 +0000
commitf7d02fdade36838dadcb1d08843037bafe68015a (patch)
treed6e36df4718b10a56933418013d1644a9a5d14ba /mcp
parentfb1be0fa7097ae68eca9fe5aaa8820afa6bdd151 (diff)
parent65b4efd8fca25380825af4f165bf51fdd68086db (diff)
Merge "[noha] Fix gtw private NIC name in j2 templates"
Diffstat (limited to 'mcp')
-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