From 26c26dc9e51d722325d1ca6f76678bb1531213d3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 16 Nov 2016 20:47:58 +0100 Subject: armband deploy: switch to local Ubuntu/MOS mirrors Since we now enabled local (multiarch) mirrors for Ubuntu, we should make the automatic deploy benefit from them, and not rely on public internet mirros at all. FIXME: completely remove repo overrides and let dea_base set these approapiately, after the packetary mirror rework is merged in Fuel@OPNFV (FUEL-223). JIRA: ARMBAND-35 JIRA: FUEL-218 JIRA: FUEL-223 Change-Id: I424fff2ec89b38a6e3a911a6287add34c64633c9 Signed-off-by: Alexandru Avadanii --- labs/arm/pod1/fuel/config/dea-pod-override.yaml | 34 ++----------------------- labs/arm/pod2/fuel/config/dea-pod-override.yaml | 34 ++----------------------- labs/arm/pod3/fuel/config/dea-pod-override.yaml | 34 ++----------------------- 3 files changed, 6 insertions(+), 96 deletions(-) (limited to 'labs') 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 -- cgit 1.2.3-korg