summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-18 18:40:33 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-23 10:22:01 +0000
commit01c9067f69feda427df66d0f7fbe1b686a393138 (patch)
treee0a30130af684926d0de1cbe3be5c0f2be97f134 /mcp/reclass/classes/cluster
parent8f97ead1ee10e6580f42de0e42412edcb4d91168 (diff)
[reclass] Parameterize tenant VLAN ranges
Instead of hardcoding the VLAN ranges in reclass, read them from IDF. This is required when VLAN segmentation is used instead of VXLAN, as lab switches should be configured appropiately (e.g. Armband PODs use VLANs 2000+ instead of 1000-1030). Change-Id: I009ccea9b328c40f055a745791eafe3393b96390 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit aa199b5e96f91111d96f53040be00736cd9309be)
Diffstat (limited to 'mcp/reclass/classes/cluster')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
index 55fc6ab5c..1f8ff4b9e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
@@ -11,4 +11,4 @@ classes:
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
- neutron_tenant_vlan_range: "1000:1030"
+ neutron_tenant_vlan_range: ${_param:opnfv_net_tenant_vlan}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
index 61baf21a4..4be308d0e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml
@@ -14,4 +14,4 @@ parameters:
neutron:
server:
backend:
- tenant_vlan_range: 1000:1999
+ tenant_vlan_range: ${_param:opnfv_net_tenant_vlan}