From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 18 Apr 2018 16:40:33 +0000 (+0200)
Subject: [reclass] Parameterize tenant VLAN ranges
X-Git-Tag: opnfv-7.0.0~221
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F55999%2F3;p=fuel.git

[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>
---

diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
index 35dab9b96..79a5fa044 100644
--- a/mcp/config/labs/local/idf-virtual1.yaml
+++ b/mcp/config/labs/local/idf-virtual1.yaml
@@ -36,7 +36,7 @@ idf:
       mask: 24
     private:
       interface: 2  # when used, will be third vnet interface, untagged
-      vlan: native
+      vlan: 1000-1999
       network: 10.1.0.0
       mask: 24
     public:
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}
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
index a3c0456cc..c7034503e 160000
--- a/mcp/scripts/pharos
+++ b/mcp/scripts/pharos
@@ -1 +1 @@
-Subproject commit a3c0456cc14a75e96808505e670d0cab37b30abc
+Subproject commit c7034503e2bb8da20f2b5c678719c7c7fbe6e61f