From c5bfbf1f4bababbbf885414d0c6bdd9f01cae900 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 29 Jul 2017 00:24:04 +0200 Subject: p/fuel: Rebase, drop upstream clone Now that Fuel@OPNFV supports submodule patching again, bring back `make fuel-patches-import`. Change-Id: Ic6f9870d94b6d302f1ebcdc21d54a83f62910af9 Signed-off-by: Alexandru Avadanii --- ...eclass-opendaylight-Use-UCA-default-repos.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch (limited to 'patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch') diff --git a/patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch b/patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch new file mode 100644 index 00000000..1abad57e --- /dev/null +++ b/patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch @@ -0,0 +1,33 @@ +From: Alexandru Avadanii +Date: Thu, 27 Jul 2017 20:09:46 +0200 +Subject: [PATCH] reclass: opendaylight: Use UCA default repos + +Current opendaylight pillar enforces a full apt repository cleanup, +removing Ubuntu Cloud Archive (UCA) repos in favor of adding +pre-hardcoded Ubuntu archive repos. + +Unlike UCA, main Ubuntu archive is split based on target arch, the +main archive.ubuntu.com holding only x86 packages, while the other +archs are hosted on ports.ubuntu.com. + +This leads to adding (only) x86-specific repositories to our AArch64 +UCA image. + +Mitigate this by ommiting "system.linux.system.repo.ubuntu" from the +opendaylight pillar, leaving the default UCA repos in place. + +Signed-off-by: Alexandru Avadanii +--- + .../classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml +index ec02e94..066488b 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml +@@ -1,5 +1,4 @@ + classes: +-- system.linux.system.repo.ubuntu + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial -- cgit 1.2.3-korg