diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-06 19:06:15 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-06 19:12:04 +0200 |
| commit | 56667c6c04fd2f11e8ac5b2637a837d91cf5b884 (patch) | |
| tree | 5eb2c8deb792430c93533c20097a7a0b88e6928e /patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch | |
| parent | 45bc407e1d6986bc6757f210919c03f07184982f (diff) | |
p/fuel: Rebase after non-root deploys got upstream
While at it, refresh "AArch64 virtio NIC names sync" to include
changes for ODL-L3 scenario recently added in Fuel@OPNFV.
Change-Id: Ic221b330d9968204b7d4da16a26454b2cf8b88eb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch | 33 |
1 files changed, 0 insertions, 33 deletions
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 deleted file mode 100644 index 1abad57e..00000000 --- a/patches/opnfv-fuel/0008-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 |