summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-29 00:24:04 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-01 20:06:16 +0200
commitc5bfbf1f4bababbbf885414d0c6bdd9f01cae900 (patch)
tree9867236392f739624feaadbc62b49e1d4103a69c /patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch
parente598628cf9603a3484d574ab5cb0c99311e2ddff (diff)
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch')
-rw-r--r--patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch b/patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch
deleted file mode 100644
index 1abad57e..00000000
--- a/patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-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 <Alexandru.Avadanii@enea.com>
----
- .../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