summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-27 20:15:38 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-27 20:16:32 +0200
commitc28998b7218701d1a9c8b7de0e43c0c82eefb928 (patch)
tree2bc45dab5114405de5245ab51f819cc2a53868a1 /patches
parentf07754a88c17467036b9b0c92a6560eceb7bcd8e (diff)
p/fuel: reclass: opendaylight: Use UCA 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. Mitigate this by ommiting "system.linux.system.repo.ubuntu" from the opendaylight pillar, leaving the default UCA repos in place. Change-Id: Ia2511e8028c8e28ec505c9a35b5dd2e76f4bcd0a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch33
1 files changed, 33 insertions, 0 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
new file mode 100644
index 00000000..1abad57e
--- /dev/null
+++ b/patches/opnfv-fuel/0011-reclass-opendaylight-Use-UCA-default-repos.patch
@@ -0,0 +1,33 @@
+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