summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-08-10 18:39:32 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-10 18:39:32 +0000
commitdf9601beb8341eb64e57673a3701a0e16e3ea018 (patch)
treefb239639fdc296e48875f836865aa7b2b63090d5
parent5f12187a6f77796da39174cbeccfc9b7282b2421 (diff)
parent82c3935c1ee7dee89c23011d248daa80b2e1e7e8 (diff)
Merge "Provide access to mgmt network from host level"
-rw-r--r--labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml16
-rw-r--r--labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml16
2 files changed, 16 insertions, 16 deletions
diff --git a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
index ae74abc..42417a6 100644
--- a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
interfaces_1:
ens3:
- fuelweb_admin
- - management
- ens4:
- storage
+ ens4:
+ - management
ens5:
- private
ens6:
@@ -51,10 +51,10 @@ transformations_1:
name: ens3
- action: add-port
bridge: br-mgmt
- name: ens3.101
+ name: ens4
- action: add-port
bridge: br-storage
- name: ens4.102
+ name: ens3.102
- action: add-port
bridge: br-mesh
name: ens5.103
@@ -118,22 +118,22 @@ network:
gateway: null
ip_ranges:
- - 192.168.0.1
- - 192.168.0.254
+ - 192.168.0.253
meta:
cidr: 192.168.0.0/24
configurable: true
map_priority: 2
name: management
- notation: cidr
+ notation: ip_ranges
render_addr_mask: internal
render_type: cidr
use_gateway: false
vips:
- haproxy
- vrouter
- vlan_start: 101
+ vlan_start: null
name: management
- vlan_start: 101
+ vlan_start: null
- cidr: 192.168.2.0/24
gateway: null
ip_ranges:
diff --git a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
index 1dce337..5d147b0 100644
--- a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -18,9 +18,9 @@ environment:
interfaces_1:
ens3:
- fuelweb_admin
- - management
- ens4:
- storage
+ ens4:
+ - management
ens5:
- private
ens6:
@@ -51,10 +51,10 @@ transformations_1:
name: ens3
- action: add-port
bridge: br-mgmt
- name: ens3.101
+ name: ens4
- action: add-port
bridge: br-storage
- name: ens4.102
+ name: ens3.102
- action: add-port
bridge: br-mesh
name: ens5.103
@@ -118,22 +118,22 @@ network:
gateway: null
ip_ranges:
- - 192.168.0.1
- - 192.168.0.254
+ - 192.168.0.253
meta:
cidr: 192.168.0.0/24
configurable: true
map_priority: 2
name: management
- notation: cidr
+ notation: ip_ranges
render_addr_mask: internal
render_type: cidr
use_gateway: false
vips:
- haproxy
- vrouter
- vlan_start: 101
+ vlan_start: null
name: management
- vlan_start: 101
+ vlan_start: null
- cidr: 192.168.2.0/24
gateway: null
ip_ranges: