diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-11-22 21:44:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-22 21:44:48 +0000 |
| commit | 866c3830822449cd92554ce7a9e2918fad6281c0 (patch) | |
| tree | ec65d5a876a44e0987bdd544e8b9187869bba95c | |
| parent | ab2a4d93dee7b1e34422cb2d17187e2fdff10def (diff) | |
| parent | 730c5541a746cf53192f24caa5b91eeb4ee16a69 (diff) | |
Merge "build: Add local Ubuntu mirror to target image" into stable/colorado
| -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" |