diff options
Diffstat (limited to 'patches/fuel-mirror')
-rw-r--r-- | patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch | 24 | ||||
-rw-r--r-- | patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch | 39 |
2 files changed, 63 insertions, 0 deletions
diff --git a/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch b/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch new file mode 100644 index 00000000..544172f7 --- /dev/null +++ b/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch @@ -0,0 +1,24 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Fri, 4 Mar 2016 00:51:40 +0100 +Subject: [PATCH] Set mos-ubuntu base URL to linux.enea.com. + +Contents of amd64 mos-ubuntu repos should be in sync with arm64. +--- + contrib/fuel_mirror/data/ubuntu.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml +index 5ce288e..9a22ef4 100644 +--- a/contrib/fuel_mirror/data/ubuntu.yaml ++++ b/contrib/fuel_mirror/data/ubuntu.yaml +@@ -1,6 +1,6 @@ + # GLOBAL variables + ubuntu_baseurl: &ubuntu_baseurl http://archive.ubuntu.com/ubuntu +-mos_baseurl: &mos_baseurl http://mirror.fuel-infra.org/mos-repos/ubuntu/$mos_version ++mos_baseurl: &mos_baseurl https://linux.enea.com/mos-repos/ubuntu/$mos_version + + fuel_release_match: + version: $openstack_version +-- +1.9.1 + diff --git a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch new file mode 100644 index 00000000..acdbe9a2 --- /dev/null +++ b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch @@ -0,0 +1,39 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Fri, 4 Mar 2016 00:59:54 +0100 +Subject: [PATCH] Add fuel-agent dependencies to Ubuntu mirror. + +Add qemu-user-static and binfmt-support to the list of packages +the local mirror of amd64 Ubuntu should contain. + +NOTE: This is needed because fuel-agent from upstream mirror does not +list them as dependencies (not patched for cross-debootstrap). + +FIXME: Will building/patching fuel-agent using OPNFV mechanism solve +missing deps from local mirror too? +--- + contrib/fuel_mirror/data/ubuntu.yaml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml +index 9a22ef4..1e12508 100644 +--- a/contrib/fuel_mirror/data/ubuntu.yaml ++++ b/contrib/fuel_mirror/data/ubuntu.yaml +@@ -77,6 +77,7 @@ packages: &packages + - "acct" + - "bash-completion" + - "bc" ++ - "binfmt-support" + - "build-essential" + - "cloud-init" + - "conntrackd" +@@ -113,6 +114,7 @@ packages: &packages + - "puppet" + - "python-lesscpy" + - "python-pip" ++ - "qemu-user-static" + - "rsyslog-gnutls" + - "rsyslog-relp" + - "screen" +-- +1.9.1 + |