Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
u/fuel: Bump & rebase for reclass update
[armband.git] / 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
index 3bc5d32..356cc8b 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Enea AB and others.
+: 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
@@ -14,75 +14,33 @@ JIRA: https://jira.opnfv.org/browse/ARMBAND-304
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml       | 2 +-
- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml       | 2 +-
- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml  | 2 +-
- .../classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml      | 2 +-
- .../classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml     | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ .../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-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-index 9a04c84..80e5bb7 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
-@@ -27,7 +27,7 @@ parameters:
+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 8f4edef..6a75099 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
+@@ -190,7 +190,7 @@ parameters:
        repo:
          uca:
-           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+           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/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-index aa6b4e3..5b6752e 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
-@@ -25,7 +25,7 @@ parameters:
+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 508d5e1..0ef0d4b 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/ocata main"
--          architectures: amd64
-+          architectures: amd64,arm64
-           key_id: EC4926EA
-           key_server: keyserver.ubuntu.com
-     network:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
-index 5e855ac..2392cf0 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
-@@ -27,7 +27,7 @@ parameters:
-       repo:
-         uca:
-           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+           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-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-index ad06754..d4e1c40 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
-@@ -65,7 +65,7 @@ parameters:
-       repo:
-         uca:
-           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
--          architectures: amd64
-+          architectures: amd64,arm64
-           key_id: EC4926EA
-           key_server: keyserver.ubuntu.com
-       kernel:
-diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
-index 5be63e5..1cfd5a3 100644
---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
-+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
-@@ -17,7 +17,7 @@ parameters:
-       repo:
-         uca:
-           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
--          architectures: amd64
-+          architectures: amd64,arm64
-           key_id: EC4926EA
-           key_server: keyserver.ubuntu.com
-     network: