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
/
virtual_environment
/
conf
/
dea.yaml
diff --git
a/fuel/deploy/templates/virtual_environment/conf/dea.yaml
b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
index
e4563ab
..
bc9a1f9
100644
(file)
--- a/
fuel/deploy/templates/virtual_environment/conf/dea.yaml
+++ b/
fuel/deploy/templates/virtual_environment/conf/dea.yaml
@@
-28,7
+28,7
@@
nodes:
fuel:
ADMIN_NETWORK:
ipaddress: 10.20.0.2
fuel:
ADMIN_NETWORK:
ipaddress: 10.20.0.2
- netmask: 255.255.
255
.0
+ netmask: 255.255.
0
.0
dhcp_pool_start: 10.20.0.3
dhcp_pool_end: 10.20.0.254
DNS_UPSTREAM: 10.118.32.193
dhcp_pool_start: 10.20.0.3
dhcp_pool_end: 10.20.0.254
DNS_UPSTREAM: 10.118.32.193
@@
-110,6
+110,8
@@
transformations_2:
bridge: br-mesh
name: eth2.103
network:
bridge: br-mesh
name: eth2.103
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:
networking_parameters:
base_mac: fa:16:3e:00:00:00
dns_nameservers:
@@
-155,7
+157,7
@@
network:
- 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
@@
-192,7
+194,7
@@
network:
- cidr: 192.168.2.0/24
gateway: null
ip_ranges:
- cidr: 192.168.2.0/24
gateway: null
ip_ranges:
- - - 192.168.2.
1
+ - - 192.168.2.
2
- 192.168.2.254
meta:
cidr: 192.168.2.0/24
- 192.168.2.254
meta:
cidr: 192.168.2.0/24
@@
-207,7
+209,7
@@
network:
vlan_start: 103
name: private
vlan_start: 103
vlan_start: 103
name: private
vlan_start: 103
- - 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
@@
-222,6
+224,8
@@
network:
use_gateway: true
name: fuelweb_admin
vlan_start: null
use_gateway: true
name: fuelweb_admin
vlan_start: null
+ public_vip: 172.16.0.2
+ public_vrouter_vip: 172.16.0.3
settings:
editable:
access:
settings:
editable:
access:
@@
-652,22
+656,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
@@
-679,19
+683,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: http://
mirror.fuel-infra.org/mos/ubuntu/
+ uri: 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