diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-11-16 20:32:06 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-11-17 00:03:23 +0100 |
| commit | 730c5541a746cf53192f24caa5b91eeb4ee16a69 (patch) | |
| tree | 32eb489fc1f49dda4a2ee6a0280a856bf1e06ebd | |
| parent | 97645632585409c504fe190f23421893bf670910 (diff) | |
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.
The first commit (bcdc1eaa74d5efd5f8c80600fb30d722bae9a421) confused
the URL of the local Ubuntu mirror with the local MOS mirror, so I
also cherry-picked a fixup on top.
JIRA: ARMBAND-35
Change-Id: Ibd58067703ce6370781a6b54fd01ce52e29686ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit bcdc1eaa74d5efd5f8c80600fb30d722bae9a421)
(cherry picked from commit 489b1cb8de7d47c818475f8830e3ea689365e2b3)
| -rw-r--r-- | patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch | 14 |
1 files changed, 13 insertions, 1 deletions
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 f3b9ea70..7008d980 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 62e6b73..9674d66 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 62e6b73..9674d66 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/mirrors/ubuntu" ++ suite: "trusty" ++ section: "main" ++ priority: null ++ - type: "deb" + name: "ubuntu" + uri: "http://ports.ubuntu.com/" + suite: "trusty" @@ -227,6 +233,12 @@ index 62e6b73..9674d66 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/mirrors/ubuntu" ++ suite: "trusty" ++ section: "main" ++ priority: null ++ - type: "deb" + name: "ubuntu" + uri: "http://ports.ubuntu.com/" + suite: "trusty" |