Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Setting local mirrors for MOS and Ubuntu in dea.yaml
[genesis.git]
/
fuel
/
deploy
/
templates
/
hardware_environment
/
conf
/
ericsson_montreal_lab
/
dea.yaml
diff --git
a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
index
12200fb
..
4abab51
100644
(file)
--- a/
fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
+++ b/
fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
@@
-35,10
+35,10
@@
nodes:
role: ceph-osd,compute
fuel:
ADMIN_NETWORK:
role: ceph-osd,compute
fuel:
ADMIN_NETWORK:
- ipaddress: 10.
4
0.0.2
+ ipaddress: 10.
2
0.0.2
netmask: 255.255.0.0
netmask: 255.255.0.0
- dhcp_pool_start: 10.
4
0.0.3
- dhcp_pool_end: 10.
4
0.0.254
+ dhcp_pool_start: 10.
2
0.0.3
+ dhcp_pool_end: 10.
2
0.0.254
DNS_UPSTREAM: 10.118.32.193
DNS_DOMAIN: opnfvericsson.ca
DNS_SEARCH: opnfvericsson.ca
DNS_UPSTREAM: 10.118.32.193
DNS_DOMAIN: opnfvericsson.ca
DNS_SEARCH: opnfvericsson.ca
@@
-215,11
+215,11
@@
network:
vlan_start: 102
name: storage
vlan_start: 220
vlan_start: 102
name: storage
vlan_start: 220
- - cidr: 10.
4
0.0.0/16
- gateway: 10.
4
0.0.2
+ - cidr: 10.
2
0.0.0/16
+ gateway: 10.
2
0.0.2
ip_ranges:
ip_ranges:
- - - 10.
4
0.0.3
- - 10.
4
0.0.254
+ - - 10.
2
0.0.3
+ - 10.
2
0.0.254
meta:
configurable: false
map_priority: 0
meta:
configurable: false
map_priority: 0
@@
-662,52
+662,52
@@
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
+ section: main
suite: trusty-updates
type: deb
suite: trusty-updates
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
+ section: main
suite: trusty-security
type: deb
suite: trusty-security
type: deb
- uri: http://
archive.ubuntu.com/ubuntu/
+ uri: http://
10.20.0.2:8080/ubuntu-part
- name: mos
priority: 1050
section: main restricted
suite: mos6.1
type: deb
- name: mos
priority: 1050
section: main restricted
suite: mos6.1
type: deb
- uri: http://10.
4
0.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
+ uri: http://10.
2
0.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
- name: mos-updates
priority: 1050
section: main restricted
suite: mos6.1-updates
type: deb
- name: mos-updates
priority: 1050
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
suite: auxiliary
type: deb
- name: Auxiliary
priority: 1150
section: main restricted
suite: auxiliary
type: deb
- uri: http://10.
4
0.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
+ uri: http://10.
2
0.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary
storage:
ephemeral_ceph:
description: Configures Nova to store ephemeral volumes in RBD. This works best
storage:
ephemeral_ceph:
description: Configures Nova to store ephemeral volumes in RBD. This works best