From: Alexandru Avadanii Date: Wed, 18 Apr 2018 16:37:29 +0000 (+0200) Subject: [fuel] Parameterize tenant VLAN ranges X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F56001%2F3;p=pharos.git [fuel] Parameterize tenant VLAN ranges - IDF: convert all tenant VLANs to ranges; - IA: convert 'M-N' to 'M:N' for `opnfv_net_tenant_vlan`; Change-Id: Ic9211235281c81ba082d10806651c35116ba4c35 Signed-off-by: Alexandru Avadanii --- diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 1cf76d36..3292b770 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -155,7 +155,7 @@ parameters: opnfv_name_servers: {{ dns_public }} opnfv_dns_server01: '{{ dns_public[0] }}' opnfv_net_mgmt_vlan: {{ vlan_mgmt }} - opnfv_net_tenant_vlan: {{ vlan_private }} + opnfv_net_tenant_vlan: "{{ vlan_private | string | replace('-', ':') }}" {%- for network in networks %} {%- for key in hosts[network] %} diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml index 5c9df095..50db0cfe 100644 --- a/labs/arm/idf-pod5.yaml +++ b/labs/arm/idf-pod5.yaml @@ -35,7 +35,7 @@ idf: mask: 24 private: interface: 1 - vlan: 2185 + vlan: 2185-2200 network: 10.1.0.0 mask: 24 public: diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml index 17f01506..4d81fa0b 100644 --- a/labs/arm/idf-pod6.yaml +++ b/labs/arm/idf-pod6.yaml @@ -33,7 +33,7 @@ idf: mask: 24 private: interface: 2 - vlan: 2325 + vlan: 2325-2340 network: 10.1.0.0 mask: 24 public: diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml index a8041a2d..7745cda4 100644 --- a/labs/arm/idf-pod7.yaml +++ b/labs/arm/idf-pod7.yaml @@ -35,7 +35,7 @@ idf: mask: 24 private: interface: 1 - vlan: 2345 + vlan: 2345-2360 network: 10.1.0.0 mask: 24 public: diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml index 281e63aa..bd810193 100644 --- a/labs/bii/idf-pod1.yaml +++ b/labs/bii/idf-pod1.yaml @@ -30,7 +30,7 @@ idf: mask: 24 private: interface: 3 - vlan: 102 + vlan: 102-132 network: 192.168.102.0 mask: 24 public: diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml index 5f990821..91227d60 100644 --- a/labs/ericsson/idf-pod1.yaml +++ b/labs/ericsson/idf-pod1.yaml @@ -34,7 +34,7 @@ idf: mask: 24 private: interface: 3 - vlan: 1000 + vlan: 1000-1030 network: 192.168.2.0 mask: 24 public: diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml index a8c370dd..f2ccef85 100644 --- a/labs/lf/idf-pod2.yaml +++ b/labs/lf/idf-pod2.yaml @@ -35,7 +35,7 @@ idf: mask: 24 private: interface: 1 - vlan: 1000 + vlan: 1000-1030 network: 10.1.0.0 # Tagged, not the same with 'private' on wiki mask: 24 public: diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml index 6e8c1349..fb817290 100644 --- a/labs/zte/idf-pod1.yaml +++ b/labs/zte/idf-pod1.yaml @@ -33,7 +33,7 @@ idf: mask: 24 private: interface: 3 - vlan: 1120 + vlan: 1120-1150 network: 192.168.63.0 mask: 24 public: