summaryrefslogtreecommitdiffstats
path: root/deploy/config
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-09-15 05:09:53 +0200
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-09-17 13:32:15 +0200
commit983af0184b9c0fbf6deecb2a851f4f89cc362c25 (patch)
tree21debbb89be2f44f9f6398b84b5289df56c3546c /deploy/config
parent1cead5571d504f5e0525eac22e9b4831867d7c18 (diff)
Stop using network transformation
Due the bug in code we did not apply network transformation to created environments, but still Fuel base on chosen segmentation type and networks to NICs assigment has been generated network schema itself. Since we don't use custom network schema we can remove transformation defintions from dea pod overrides files. However there is a need to configure NIC properties in case of dpdk deployment. JIRA: FUEL-192 Change-Id: Ib7dab4d61910ac8c44b6d91e0c486c9693034823 Signed-off-by: Michal Skalski <mskalski@mirantis.com> Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'deploy/config')
-rw-r--r--deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml59
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml59
-rw-r--r--deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml59
-rw-r--r--deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml59
4 files changed, 92 insertions, 144 deletions
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index 985a2920c..32b2cfb22 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
- private
ens6:
- public
-transformations_1:
- transformations:
- - action: add-br
- name: br-fw-admin
- - action: add-br
- name: br-mgmt
- - action: add-br
- name: br-storage
- - action: add-br
- name: br-ex
- - action: add-br
- name: br-floating
- provider: ovs
- - action: add-patch
- bridges:
- - br-floating
- - br-ex
- mtu: 65000
- provider: ovs
- - action: add-br
- name: br-mesh
- - action: add-port
- bridge: br-fw-admin
- name: ens3
- - action: add-port
- bridge: br-mgmt
- name: ens4
- - action: add-port
- bridge: br-storage
- name: ens3.102
- - action: add-port
- bridge: br-mesh
- name: ens5.103
- - action: add-port
- bridge: br-ex
- name: ens6
+interfaces_dpdk:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ - interface_properties:
+ dpdk:
+ enabled: true
+ ens6:
+ - public
+interfaces_vlan:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ ens6:
+ - public
fuel:
ADMIN_NETWORK:
dhcp_pool_end: 10.20.0.254
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index ce3b62af9..cb80e3855 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
- private
ens6:
- public
-transformations_1:
- transformations:
- - action: add-br
- name: br-fw-admin
- - action: add-br
- name: br-mgmt
- - action: add-br
- name: br-storage
- - action: add-br
- name: br-ex
- - action: add-br
- name: br-floating
- provider: ovs
- - action: add-patch
- bridges:
- - br-floating
- - br-ex
- mtu: 65000
- provider: ovs
- - action: add-br
- name: br-mesh
- - action: add-port
- bridge: br-fw-admin
- name: ens3
- - action: add-port
- bridge: br-mgmt
- name: ens4
- - action: add-port
- bridge: br-storage
- name: ens3.102
- - action: add-port
- bridge: br-mesh
- name: ens5.103
- - action: add-port
- bridge: br-ex
- name: ens6
+interfaces_dpdk:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ - interface_properties:
+ dpdk:
+ enabled: true
+ ens6:
+ - public
+interfaces_vlan:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ ens6:
+ - public
fuel:
ADMIN_NETWORK:
dhcp_pool_end: 10.20.0.254
diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index 736e9af3c..92cc0e616 100644
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
- private
ens6:
- public
-transformations_1:
- transformations:
- - action: add-br
- name: br-fw-admin
- - action: add-br
- name: br-mgmt
- - action: add-br
- name: br-storage
- - action: add-br
- name: br-ex
- - action: add-br
- name: br-floating
- provider: ovs
- - action: add-patch
- bridges:
- - br-floating
- - br-ex
- mtu: 65000
- provider: ovs
- - action: add-br
- name: br-mesh
- - action: add-port
- bridge: br-fw-admin
- name: ens3
- - action: add-port
- bridge: br-mgmt
- name: ens4
- - action: add-port
- bridge: br-storage
- name: ens3.102
- - action: add-port
- bridge: br-mesh
- name: ens5.103
- - action: add-port
- bridge: br-ex
- name: ens6
+interfaces_dpdk:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ - interface_properties:
+ dpdk:
+ enabled: true
+ ens6:
+ - public
+interfaces_vlan:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ ens6:
+ - public
fuel:
ADMIN_NETWORK:
dhcp_pool_end: 10.20.0.254
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
index eed982d01..ed7c63fac 100644
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
@@ -25,42 +25,29 @@ interfaces_1:
- private
ens6:
- public
-transformations_1:
- transformations:
- - action: add-br
- name: br-fw-admin
- - action: add-br
- name: br-mgmt
- - action: add-br
- name: br-storage
- - action: add-br
- name: br-ex
- - action: add-br
- name: br-floating
- provider: ovs
- - action: add-patch
- bridges:
- - br-floating
- - br-ex
- mtu: 65000
- provider: ovs
- - action: add-br
- name: br-mesh
- - action: add-port
- bridge: br-fw-admin
- name: ens3
- - action: add-port
- bridge: br-mgmt
- name: ens4
- - action: add-port
- bridge: br-storage
- name: ens3.102
- - action: add-port
- bridge: br-mesh
- name: ens5.103
- - action: add-port
- bridge: br-ex
- name: ens6
+interfaces_dpdk:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ - interface_properties:
+ dpdk:
+ enabled: true
+ ens6:
+ - public
+interfaces_vlan:
+ ens3:
+ - fuelweb_admin
+ - storage
+ ens4:
+ - management
+ ens5:
+ - private
+ ens6:
+ - public
fuel:
ADMIN_NETWORK:
dhcp_pool_end: 10.20.0.254