summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-02-08 17:28:03 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-02-08 17:28:03 +0400
commit5fda43edc9289ccde040d6bfe42e85bf88c77f1b (patch)
tree9c37ac01ff90df9056e75efc9cfc89c3f1dd4f8d
parente2378211a09397ab35e7c18d53d407360eaf470b (diff)
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>
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml3
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml3
-rw-r--r--deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml3
-rw-r--r--deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml3
-rw-r--r--deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml3
5 files changed, 0 insertions, 15 deletions
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 16f8a92e0..ef77d91be 100644
--- 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 01767ee1a..0f37f9fd0 100644
--- 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 245f0f28d..017919d96 100644
--- 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 e932d661e..c1cc7150f 100644
--- 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 ba3c57901..526052779 100644
--- 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