diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-01-15 13:52:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-15 13:52:26 +0000 |
| commit | d2a011c63c85740e8060b6052b511812a9fbd28f (patch) | |
| tree | 4c85c3eb8ee1908932b5ef715b710700cd053aca /mcp | |
| parent | 6be6f921ef58007804641a6defe7536af03e6a97 (diff) | |
| parent | baee79dc7b16db99d0a45235a8dd2c89c0bf28db (diff) | |
Merge "[noha] Fix gtw private NIC name in j2 templates" into stable/gambia
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 | 4 | ||||
| -rw-r--r-- | mcp/reclass/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 |