aboutsummaryrefslogtreecommitdiffstats
path: root/labs
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-11-19 16:22:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-19 16:22:49 +0000
commit1735af0ea384b170b36afd6311317b1d3567649d (patch)
tree5b47f0bacff549d33358f009b9683797e599d137 /labs
parentc9a05583d30155a4d193f05ad465106f18bc7a76 (diff)
parent26c26dc9e51d722325d1ca6f76678bb1531213d3 (diff)
Merge "armband deploy: switch to local Ubuntu/MOS mirrors"
Diffstat (limited to 'labs')
-rw-r--r--labs/arm/pod1/fuel/config/dea-pod-override.yaml34
-rw-r--r--labs/arm/pod2/fuel/config/dea-pod-override.yaml34
-rw-r--r--labs/arm/pod3/fuel/config/dea-pod-override.yaml34
3 files changed, 6 insertions, 96 deletions
diff --git a/labs/arm/pod1/fuel/config/dea-pod-override.yaml b/labs/arm/pod1/fuel/config/dea-pod-override.yaml
index 6348d6a..91a82a4 100644
--- a/labs/arm/pod1/fuel/config/dea-pod-override.yaml
+++ b/labs/arm/pod1/fuel/config/dea-pod-override.yaml
@@ -218,46 +218,16 @@ settings:
value:
- name: ubuntu
priority: null
- section: main universe multiverse
+ section: main
suite: trusty
type: deb
- uri: http://ports.ubuntu.com/
- - name: ubuntu-updates
- priority: null
- section: main universe multiverse
- suite: trusty-updates
- type: deb
- uri: http://ports.ubuntu.com/
- - name: ubuntu-security
- priority: null
- section: main universe multiverse
- suite: trusty-security
- type: deb
- uri: http://ports.ubuntu.com/
+ uri: http://10.20.0.2:8080/mirrors/ubuntu/
- name: mos
priority: 1050
section: main restricted
suite: mos9.0
type: deb
uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64
- - name: mos-updates
- priority: 1050
- section: main restricted
- suite: mos9.0-updates
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- - name: mos-security
- priority: 1050
- section: main restricted
- suite: mos9.0-security
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- - name: mos-holdback
- priority: 1100
- section: main restricted
- suite: mos9.0-holdback
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- name: Auxiliary
priority: 1150
section: main restricted
diff --git a/labs/arm/pod2/fuel/config/dea-pod-override.yaml b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
index 1b92aa6..51f5abb 100644
--- a/labs/arm/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
@@ -325,46 +325,16 @@ settings:
value:
- name: ubuntu
priority: null
- section: main universe multiverse
+ section: main
suite: trusty
type: deb
- uri: http://ports.ubuntu.com/
- - name: ubuntu-updates
- priority: null
- section: main universe multiverse
- suite: trusty-updates
- type: deb
- uri: http://ports.ubuntu.com/
- - name: ubuntu-security
- priority: null
- section: main universe multiverse
- suite: trusty-security
- type: deb
- uri: http://ports.ubuntu.com/
+ uri: http://10.20.0.2:8080/mirrors/ubuntu/
- name: mos
priority: 1050
section: main restricted
suite: mos9.0
type: deb
uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64
- - name: mos-updates
- priority: 1050
- section: main restricted
- suite: mos9.0-updates
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- - name: mos-security
- priority: 1050
- section: main restricted
- suite: mos9.0-security
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- - name: mos-holdback
- priority: 1100
- section: main restricted
- suite: mos9.0-holdback
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- name: Auxiliary
priority: 1150
section: main restricted
diff --git a/labs/arm/pod3/fuel/config/dea-pod-override.yaml b/labs/arm/pod3/fuel/config/dea-pod-override.yaml
index 2782478..6a74dc3 100644
--- a/labs/arm/pod3/fuel/config/dea-pod-override.yaml
+++ b/labs/arm/pod3/fuel/config/dea-pod-override.yaml
@@ -220,46 +220,16 @@ settings:
value:
- name: ubuntu
priority: null
- section: main universe multiverse
+ section: main
suite: trusty
type: deb
- uri: http://ports.ubuntu.com/
- - name: ubuntu-updates
- priority: null
- section: main universe multiverse
- suite: trusty-updates
- type: deb
- uri: http://ports.ubuntu.com/
- - name: ubuntu-security
- priority: null
- section: main universe multiverse
- suite: trusty-security
- type: deb
- uri: http://ports.ubuntu.com/
+ uri: http://10.20.0.2:8080/mirrors/ubuntu/
- name: mos
priority: 1050
section: main restricted
suite: mos9.0
type: deb
uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64
- - name: mos-updates
- priority: 1050
- section: main restricted
- suite: mos9.0-updates
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- - name: mos-security
- priority: 1050
- section: main restricted
- suite: mos9.0-security
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- - name: mos-holdback
- priority: 1100
- section: main restricted
- suite: mos9.0-holdback
- type: deb
- uri: http://linux.enea.com/mos-repos/ubuntu/9.0
- name: Auxiliary
priority: 1150
section: main restricted