Remove vlan id range from scenarios

Since scenarios vlan_range config has precedence,
so it doesn't matter that is in dea pod override file of the labs.
Let's define/get actual vlan id range in/from lab specific configs.

Change-Id: Iba329ae94c6f5a2e3bf046b4838d5a2c3d49bf5e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
index 16f8a92..ef77d91 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
@@ -85,9 +85,6 @@ dea-override-config:
   network:
     networking_parameters:
       segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
     networks:
     - cidr: null
       gateway: null

diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
index 01767ee..0f37f9f 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
@@ -78,9 +78,6 @@ dea-override-config:
   network:
     networking_parameters:
       segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
     networks:
     - cidr: null
       gateway: null

diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 245f0f2..017919d 100644 (file)
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -86,9 +86,6 @@ dea-override-config:
   network:
     networking_parameters:
       segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
     networks:
     - cidr: null
       gateway: null

diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
index e932d66..c1cc715 100644 (file)
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
@@ -77,9 +77,6 @@ dea-override-config:
   network:
     networking_parameters:
       segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
     networks:
     - cidr: null
       gateway: null

diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index ba3c579..5260527 100644 (file)
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -84,9 +84,6 @@ dea-override-config:
   network:
     networking_parameters:
       segmentation_type: vlan
-      vlan_range:
-      - 1000
-      - 1030
     networks:
     - cidr: null
       gateway: null