Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Opendaylight installation and IP address adjusments
[genesis.git]
/
fuel
/
deploy
/
templates
/
hardware_environment
/
conf
/
linux_foundation_lab
/
pod2
/
dea.yaml
diff --git
a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
index
3e99b64
..
81cbcbf
100644
(file)
--- a/
fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
+++ b/
fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
@@
-112,8
+112,8
@@
transformations_2:
bridge: br-mesh
name: eth0.302
network:
bridge: br-mesh
name: eth0.302
network:
- management_vip: 192.168.
0
.2
- management_vrouter_vip: 192.168.
0
.3
+ management_vip: 192.168.
1
.2
+ management_vrouter_vip: 192.168.
1
.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:
@@
-175,11
+175,11
@@
network:
vlan_start: 103
name: private
vlan_start: 302
vlan_start: 103
name: private
vlan_start: 302
- - cidr: 192.168.
0
.0/24
+ - cidr: 192.168.
1
.0/24
gateway: null
ip_ranges:
gateway: null
ip_ranges:
- - - 192.168.
0
.2
- - 192.168.
0
.254
+ - - 192.168.
1
.2
+ - 192.168.
1
.254
meta:
cidr: 192.168.0.0/24
configurable: true
meta:
cidr: 192.168.0.0/24
configurable: true
@@
-195,11
+195,11
@@
network:
vlan_start: 101
name: management
vlan_start: 300
vlan_start: 101
name: management
vlan_start: 300
- - cidr: 192.168.
1
.0/24
+ - cidr: 192.168.
0
.0/24
gateway: null
ip_ranges:
gateway: null
ip_ranges:
- - - 192.168.
1
.2
- - 192.168.
1
.254
+ - - 192.168.
0
.2
+ - 192.168.
0
.254
meta:
cidr: 192.168.1.0/24
configurable: true
meta:
cidr: 192.168.1.0/24
configurable: true
@@
-659,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
@@
-686,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: 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