summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/installers/fuel/pod_config.yml.j22
-rw-r--r--labs/arm/idf-pod5.yaml2
-rw-r--r--labs/arm/idf-pod6.yaml2
-rw-r--r--labs/arm/idf-pod7.yaml2
-rw-r--r--labs/bii/idf-pod1.yaml2
-rw-r--r--labs/ericsson/idf-pod1.yaml2
-rw-r--r--labs/lf/idf-pod2.yaml2
-rw-r--r--labs/zte/idf-pod1.yaml2
8 files changed, 8 insertions, 8 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 1cf76d3..3292b77 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 5c9df09..50db0cf 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 17f0150..4d81fa0 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 a8041a2..7745cda 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 281e63a..bd81019 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 5f99082..91227d6 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 a8c370d..f2ccef8 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 6e8c134..fb81729 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: