From: Alexandru Avadanii Date: Thu, 27 Jul 2017 18:09:46 +0000 (+0200) Subject: reclass: opendaylight: Use UCA default repos X-Git-Tag: opnfv-5.0.RC1~152^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F38545%2F1;p=fuel.git 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. Change-Id: Ia7033bcb544d8752d5557bbabc92c92c5008b00c Signed-off-by: Alexandru Avadanii --- 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 6c6640a4f..38431a58c 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