From 0abdc6ec87ddaa396bb3069a67117e3f3bb6258c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 6 Apr 2018 23:43:54 +0200 Subject: u/fuel: Bump & rebase for ODL Oxygen Drop obsolete patches: - UCA arch list extension (upstream no longer enforces the arch); Change-Id: I223964af674979f034a61aefff85c9f47af466d9 Signed-off-by: Alexandru Avadanii (cherry picked from commit 13c73bfed1188a5e2c7355cf7eb5c5a1da006c22) --- ...tal-virtual-Extend-arch-list-for-UCA-repo.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch (limited to 'patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch') diff --git a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch deleted file mode 100644 index cc41beb6..00000000 --- a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ /dev/null @@ -1,61 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Wed, 30 Aug 2017 22:15:07 +0200 -Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo - -While at it, handle pike-staging PPA too. - -JIRA: https://jira.opnfv.org/browse/ARMBAND-304 - -Signed-off-by: Alexandru Avadanii ---- - mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 4 ++-- - mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 -index 9db8f35d..026096b9 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 -@@ -251,12 +251,12 @@ parameters: - repo: - uca-staging: - source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: 9F68104E - key_server: keyserver.ubuntu.com - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: -diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml -index cef0b531..c3642b50 100644 ---- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml -+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml -@@ -97,13 +97,13 @@ parameters: - uca-staging: - # yamllint disable rule:line-length - source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: 9F68104E - key_server: keyserver.ubuntu.com - # yamllint enable rule:line-length - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: -- cgit 1.2.3-korg