patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Wed, 30 Aug 2017 22:15:07 +0200
  11 Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo
  12
  13 While at it, handle pike-staging PPA too.
  14
  15 JIRA: https://jira.opnfv.org/browse/ARMBAND-304
  16
  17 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  18 ---
  19  mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 4 ++--
  20  mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml  | 4 ++--
  21  2 files changed, 4 insertions(+), 4 deletions(-)
  22
  23 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
  24 index 9db8f35d..026096b9 100644
  25 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
  26 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
  27 @@ -251,12 +251,12 @@ parameters:
  28        repo:
  29          uca-staging:
  30            source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
  31 -          architectures: amd64
  32 +          architectures: amd64,arm64
  33            key_id: 9F68104E
  34            key_server: keyserver.ubuntu.com
  35          uca:
  36            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
  37 -          architectures: amd64
  38 +          architectures: amd64,arm64
  39            key_id: EC4926EA
  40            key_server: keyserver.ubuntu.com
  41        kernel:
  42 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
  43 index cef0b531..c3642b50 100644
  44 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
  45 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
  46 @@ -97,13 +97,13 @@ parameters:
  47          uca-staging:
  48            # yamllint disable rule:line-length
  49            source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
  50 -          architectures: amd64
  51 +          architectures: amd64,arm64
  52            key_id: 9F68104E
  53            key_server: keyserver.ubuntu.com
  54            # yamllint enable rule:line-length
  55          uca:
  56            source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
  57 -          architectures: amd64
  58 +          architectures: amd64,arm64
  59            key_id: EC4926EA
  60            key_server: keyserver.ubuntu.com
  61        kernel: