From 466a4c3252e17370ed4d9d7c854738b26dbf1df1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 7 Dec 2017 18:03:26 +0100 Subject: u/fuel: Bump & rebase for Pike upgrade - virtual deploys will use only UCA repos, without Armband/MCP; - base image pre-build is now upstream, drop our patches; - drop p/fuel libvirtd group workaround, now upstream in Fuel@OPNFV; - drop p/reclass glusterfs PPA arch extension, obsolete; - refactor armband repos in system.repo.mcp into: * armband (new, contains kernel, libvirt etc.); * armband_openstack (move into system.repo.mcp.openstack); * armband_mk_openstack (move intro system.repo.mcp.openstack); * armband_mcp_extra (move into system.repo.mcp.extra); - drop 'nova: Update console defaults for armv7, aarch64'; - minor rebase of nova libvirt driver patches in our roll-up; JIRA: ARMBAND-335 Change-Id: Ic5b7736cdd1d1ad5ff25728925198e8ea3e6b5b1 Signed-off-by: Alexandru Avadanii --- ...tal-virtual-Extend-arch-list-for-UCA-repo.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch (limited to 'patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch') diff --git a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch new file mode 100644 index 00000000..ad883961 --- /dev/null +++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch @@ -0,0 +1,46 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 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 + +JIRA: https://jira.opnfv.org/browse/ARMBAND-304 + +Signed-off-by: Alexandru Avadanii +--- + .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml | 2 +- + .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +index e2f6539..2a14c66 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +@@ -199,7 +199,7 @@ parameters: + repo: + 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/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +index d677420..fbbc7ef 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +@@ -98,7 +98,7 @@ parameters: + repo: + 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