Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updates docs for SR1 with final revision
[genesis.git]
/
fuel
/
deploy
/
templates
/
hardware_environment
/
conf
/
linux_foundation_lab
/
pod1
/
dea.yaml
diff --git
a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
index
520cfc8
..
db29fe9
100644
(file)
--- a/
fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
+++ b/
fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
@@
-112,14
+112,16
@@
transformations_2:
bridge: br-mesh
name: eth1.302
network:
bridge: br-mesh
name: eth1.302
network:
+ management_vip: 192.168.0.2
+ management_vrouter_vip: 192.168.0.3
networking_parameters:
base_mac: fa:16:3e:00:00:00
dns_nameservers:
- 8.8.4.4
- 8.8.8.8
floating_ranges:
networking_parameters:
base_mac: fa:16:3e:00:00:00
dns_nameservers:
- 8.8.4.4
- 8.8.8.8
floating_ranges:
- - - 172.30.9.
8
0
- - 172.30.9.
89
+ - - 172.30.9.
16
0
+ - 172.30.9.
254
gre_id_range:
- 2
- 65535
gre_id_range:
- 2
- 65535
@@
-134,15
+136,15
@@
network:
- cidr: 172.30.9.0/24
gateway: 172.30.9.1
ip_ranges:
- cidr: 172.30.9.0/24
gateway: 172.30.9.1
ip_ranges:
- - - 172.30.9.
70
- - 172.30.9.
7
9
+ - - 172.30.9.
64
+ - 172.30.9.
15
9
meta:
meta:
- cidr: 172.
30.9
.0/24
+ cidr: 172.
16.0
.0/24
configurable: true
floating_range_var: floating_ranges
ip_range:
configurable: true
floating_range_var: floating_ranges
ip_range:
- - 172.
30.9.70
- - 172.
30.9.79
+ - 172.
16.0.2
+ - 172.
16.0.126
map_priority: 1
name: public
notation: ip_ranges
map_priority: 1
name: public
notation: ip_ranges
@@
-155,10
+157,28
@@
network:
vlan_start: null
name: public
vlan_start: null
vlan_start: null
name: public
vlan_start: null
+ - cidr: 192.168.2.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.2.2
+ - 192.168.2.254
+ meta:
+ assign_vip: 192.168.2.0/24
+ configurable: true
+ map_priority: 2
+ name: private
+ notation: cidr
+ render_addr_mask: private
+ render_type: cidr
+ seg_type: gre
+ use_gateway: false
+ vlan_start: 103
+ name: private
+ vlan_start: 302
- cidr: 192.168.0.0/24
gateway: null
ip_ranges:
- cidr: 192.168.0.0/24
gateway: null
ip_ranges:
- - - 192.168.0.
1
+ - - 192.168.0.
2
- 192.168.0.254
meta:
cidr: 192.168.0.0/24
- 192.168.0.254
meta:
cidr: 192.168.0.0/24
@@
-172,13
+192,13
@@
network:
vips:
- haproxy
- vrouter
vips:
- haproxy
- vrouter
- vlan_start:
300
+ vlan_start:
101
name: management
vlan_start: 300
- cidr: 192.168.1.0/24
gateway: null
ip_ranges:
name: management
vlan_start: 300
- cidr: 192.168.1.0/24
gateway: null
ip_ranges:
- - - 192.168.1.
1
+ - - 192.168.1.
2
- 192.168.1.254
meta:
cidr: 192.168.1.0/24
- 192.168.1.254
meta:
cidr: 192.168.1.0/24
@@
-189,32
+209,14
@@
network:
render_addr_mask: storage
render_type: cidr
use_gateway: false
render_addr_mask: storage
render_type: cidr
use_gateway: false
- vlan_start:
301
+ vlan_start:
102
name: storage
vlan_start: 301
name: storage
vlan_start: 301
- - cidr: 192.168.2.0/24
- gateway: null
- ip_ranges:
- - - 192.168.2.1
- - 192.168.2.254
- meta:
- assign_vip: 192.168.2.0/24
- configurable: true
- map_priority: 2
- name: private
- notation: cidr
- render_addr_mask: private
- render_type: cidr
- seg_type: gre
- use_gateway: false
- vlan_start: 302
- name: private
- vlan_start: 302
- - cidr: 10.20.0.0/24
+ - cidr: 10.20.0.0/16
gateway: 10.20.0.2
ip_ranges:
- - 10.20.0.3
gateway: 10.20.0.2
ip_ranges:
- - 10.20.0.3
- - 10.20.
255
.254
+ - 10.20.
0
.254
meta:
configurable: false
map_priority: 0
meta:
configurable: false
map_priority: 0
@@
-225,6
+227,8
@@
network:
use_gateway: true
name: fuelweb_admin
vlan_start: null
use_gateway: true
name: fuelweb_admin
vlan_start: null
+ public_vip: 172.30.9.64
+ public_vrouter_vip: 172.30.9.65
settings:
editable:
access:
settings:
editable:
access:
@@
-655,22
+659,22
@@
settings:
value:
- name: ubuntu
priority: null
value:
- name: ubuntu
priority: null
- section: main
universe multiverse
+ section: main
suite: trusty
type: deb
suite: trusty
type: deb
- uri: http://
archive.ubuntu.com/ubuntu/
+ uri: http://
10.20.0.2:8080/ubuntu-part
- name: ubuntu-updates
priority: null
- name: ubuntu-updates
priority: null
- section: main
universe multiverse
- suite: trusty
-updates
+ section: main
+ suite: trusty
type: deb
type: deb
- uri: http://
archive.ubuntu.com/ubuntu/
+ uri: http://
10.20.0.2:8080/ubuntu-part
- name: ubuntu-security
priority: null
- name: ubuntu-security
priority: null
- section: main
universe multiverse
- suite: trusty
-security
+ section: main
+ suite: trusty
type: deb
type: deb
- uri: http://
archive.ubuntu.com/ubuntu/
+ uri: http://
10.20.0.2:8080/ubuntu-part
- name: mos
priority: 1050
section: main restricted
- name: mos
priority: 1050
section: main restricted
@@
-682,19
+686,19
@@
settings:
section: main restricted
suite: mos6.1-updates
type: deb
section: main restricted
suite: mos6.1-updates
type: deb
- uri: http://
mirror.fuel-infra.org/mos/ubuntu/
+ uri: http://
10.20.0.2:8080/mos-ubuntu
- name: mos-security
priority: 1050
section: main restricted
suite: mos6.1-security
type: deb
- name: mos-security
priority: 1050
section: main restricted
suite: mos6.1-security
type: deb
- uri: h
ttp://mirror.fuel-infra.org/mos/ubuntu/
+ uri: h
http://10.20.0.2:8080/mos-ubuntu
- name: mos-holdback
priority: 1100
section: main restricted
suite: mos6.1-holdback
type: deb
- name: mos-holdback
priority: 1100
section: main restricted
suite: mos6.1-holdback
type: deb
- uri: http://
mirror.fuel-infra.org/mos/ubuntu/
+ uri: http://
10.20.0.2:8080/mos-ubuntu
- name: Auxiliary
priority: 1150
section: main restricted
- name: Auxiliary
priority: 1150
section: main restricted