summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
blob: cc41beb6a1a422543ab36f7082e3363d307899fa (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: 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 <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
---
 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: