From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 6 Apr 2018 05:44:19 +0000 (+0200)
Subject: [UCA] Stop enforcing repository architecture
X-Git-Tag: opnfv-6.0.0~18^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F55101%2F1;p=fuel.git

[UCA] Stop enforcing repository architecture

Let APT automatically choose the UCA/Pike-staging PPA architecture
based on current system architecture instead of hardcoding it.

Change-Id: I4fe645847ac0fb70a852477feba9f788fcb8da81
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9cac6117a760279b6be83034f5634f5505032cc0)
---

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 9db8f35d2..603056622 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,10 @@ parameters:
       repo:
         uca-staging:
           source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
-          architectures: amd64
           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
           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 cef0b5318..7c6ce90b7 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,11 @@ 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
           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
           key_id: EC4926EA
           key_server: keyserver.ubuntu.com
       kernel: