Setting local mirrors for MOS and Ubuntu in dea.yaml

Change-Id: I528defb97369768d107565a07d5bfda95b31b37b
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>

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:
-    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

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 aae7cf3..762aebd 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
@@ -659,22 +659,22 @@ 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
@@ -686,19 +686,19 @@ settings:
           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: hhttp://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

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..153af06 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
@@ -659,22 +659,22 @@ 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
@@ -686,19 +686,19 @@ settings:
           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

diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
index 0d4e141..df6bf33 100644 (file)
--- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
@@ -660,22 +660,22 @@ 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
@@ -687,19 +687,19 @@ settings:
           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

diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
index cb6fbf9..c7a901d 100644 (file)
--- a/fuel/deploy/templates/virtual_environment/conf/dea.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
@@ -656,22 +656,22 @@ 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
@@ -683,19 +683,19 @@ settings:
           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