summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-23 15:21:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-23 15:21:36 +0000
commit9066a682aed937d566f661e975070855aafe5d8f (patch)
tree58bc0ae2aafc025d6a1cd28f05837b92cd1090f9 /mcp/reclass/classes
parent13f87a7493f12c5de4c103c6bfecd00587cd6211 (diff)
parent0842bf5367a04a1434f13ba0870e4fcd1f19c6b1 (diff)
Merge "[ha] Fix tenant NIC OS config for VLAN ranges" into stable/fraser
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j25
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j25
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j25
3 files changed, 9 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
index a3a86723f..912537f8f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
@@ -8,7 +8,8 @@
{%- import 'net_map.j2' as nm with context %}
{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
{%- set nics = { nm.cmp001.nic_private: True } %}
-{%- set vlans = { nm.vlan_private: nm.cmp001.nic_private } %}
+{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %}
+{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %}
---
parameters:
linux:
@@ -45,4 +46,4 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - {{ nm.cmp001.nic_private }}{% if nm.vlan_private | int > 0 %}.{{ nm.vlan_private }}{% endif %}
+ - {{ nm.cmp001.nic_private }}{% if vlan_private_start | int > 0 %}.{{ vlan_private_start }}{% endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2
index a3a86723f..912537f8f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2
@@ -8,7 +8,8 @@
{%- import 'net_map.j2' as nm with context %}
{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
{%- set nics = { nm.cmp001.nic_private: True } %}
-{%- set vlans = { nm.vlan_private: nm.cmp001.nic_private } %}
+{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %}
+{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %}
---
parameters:
linux:
@@ -45,4 +46,4 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - {{ nm.cmp001.nic_private }}{% if nm.vlan_private | int > 0 %}.{{ nm.vlan_private }}{% endif %}
+ - {{ nm.cmp001.nic_private }}{% if vlan_private_start | int > 0 %}.{{ vlan_private_start }}{% endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index a3a86723f..912537f8f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
@@ -8,7 +8,8 @@
{%- import 'net_map.j2' as nm with context %}
{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
{%- set nics = { nm.cmp001.nic_private: True } %}
-{%- set vlans = { nm.vlan_private: nm.cmp001.nic_private } %}
+{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %}
+{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %}
---
parameters:
linux:
@@ -45,4 +46,4 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - {{ nm.cmp001.nic_private }}{% if nm.vlan_private | int > 0 %}.{{ nm.vlan_private }}{% endif %}
+ - {{ nm.cmp001.nic_private }}{% if vlan_private_start | int > 0 %}.{{ vlan_private_start }}{% endif %}