diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-18 18:40:33 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-18 22:20:57 +0200 |
| commit | aa199b5e96f91111d96f53040be00736cd9309be (patch) | |
| tree | c3ccc5ed2233f514225df60af9b8dbfa60b01423 /mcp | |
| parent | 67b7248e3cc8550ebd757ebb48e2536770f073f8 (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>
Diffstat (limited to 'mcp')
4 files changed, 3 insertions, 3 deletions
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 -Subproject a3c0456cc14a75e96808505e670d0cab37b30ab +Subproject c7034503e2bb8da20f2b5c678719c7c7fbe6e61 |