From bcdc1eaa74d5efd5f8c80600fb30d722bae9a421 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 16 Nov 2016 20:32:06 +0100 Subject: [PATCH] build: Add local Ubuntu mirror to target image When deploying via Jenkins CI, the repos used for target image building are overridden to use the local Ubuntu mirror on Fuel Master instead of fetching packages from internet. However, when deploying manually, only bootstrap image building benefits from the local Ubuntu mirror. While keeping the internet mirrors, add the local Ubuntu mirror to target image build repo list. JIRA: ARMBAND-35 Change-Id: Ibd58067703ce6370781a6b54fd01ce52e29686ac Signed-off-by: Alexandru Avadanii --- ...01-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch index 6dee64d9..54652af4 100644 --- a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch +++ b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch @@ -17,7 +17,7 @@ diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/ index d08a4fc..65646d4 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml -@@ -2314,3 +2314,290 @@ +@@ -2314,3 +2314,302 @@ weight: 61 type: "checkbox" value: true @@ -50,6 +50,12 @@ index d08a4fc..65646d4 100644 + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-9.0/operations.html#external-ubuntu-ops). + value: + - type: "deb" ++ name: "ubuntu-local" ++ uri: "http://{settings.MASTER_IP}:8080/ubuntu/x86_64" ++ suite: "trusty" ++ section: "main" ++ priority: null ++ - type: "deb" + name: "ubuntu" + uri: "http://ports.ubuntu.com/" + suite: "trusty" @@ -227,6 +233,12 @@ index d08a4fc..65646d4 100644 + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-9.0/operations.html#external-ubuntu-ops). + value: + - type: "deb" ++ name: "ubuntu-local" ++ uri: "http://{settings.MASTER_IP}:8080/ubuntu/x86_64" ++ suite: "trusty" ++ section: "main" ++ priority: null ++ - type: "deb" + name: "ubuntu" + uri: "http://ports.ubuntu.com/" + suite: "trusty" -- 2.16.6