X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=genesis.git;a=blobdiff_plain;f=fuel%2Fdeploy%2Ftemplates%2Fhardware_environment%2Fconf%2Fericsson_montreal_lab%2Fdea.yaml;fp=fuel%2Fdeploy%2Ftemplates%2Fhardware_environment%2Fconf%2Fericsson_montreal_lab%2Fdea.yaml;h=4abab51a88ccfd6b98a5c3bfe35f41d7945fa0fd;hp=12200fb395ddcfaec828dcf5159e271ce3e2db2e;hb=191c0ddc773c977538560b4d869f32b2b42ea1a2;hpb=acbb3b26c855ff35c8774eff8cd696b0198f9ac8 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 --- 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: - ipaddress: 10.40.0.2 + ipaddress: 10.20.0.2 netmask: 255.255.0.0 - dhcp_pool_start: 10.40.0.3 - dhcp_pool_end: 10.40.0.254 + dhcp_pool_start: 10.20.0.3 + dhcp_pool_end: 10.20.0.254 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 - - cidr: 10.40.0.0/16 - gateway: 10.40.0.2 + - cidr: 10.20.0.0/16 + gateway: 10.20.0.2 ip_ranges: - - - 10.40.0.3 - - 10.40.0.254 + - - 10.20.0.3 + - 10.20.0.254 meta: configurable: false map_priority: 0 @@ -662,52 +662,52 @@ settings: value: - name: ubuntu priority: null - section: main universe multiverse + section: main suite: trusty type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/ubuntu-part - name: ubuntu-updates priority: null - section: main universe multiverse + section: main 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 - section: main universe multiverse + section: main 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 - uri: http://10.40.0.2:8080/2014.2.2-6.1/ubuntu/x86_64 + uri: http://10.20.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 - 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 - 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 - 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 - uri: http://10.40.0.2:8080/2014.2.2-6.1/ubuntu/auxiliary + uri: http://10.20.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