diff options
| -rw-r--r-- | patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch | 4 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch (renamed from patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch) | 0 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch | 61 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch (renamed from patches/opnfv-fuel/0012-Revert-Get-back-to-the-GA-kernel.patch) | 0 | ||||
| m--------- | upstream/fuel | 0 |
5 files changed, 2 insertions, 63 deletions
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch index c732f719..7bdac236 100644 --- a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch @@ -33,10 +33,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 5 insertions(+) diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls -index e7093130..a1ebf764 100644 +index 069dc278..0d8cd8e6 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls -@@ -91,4 +91,9 @@ opendaylight: +@@ -92,4 +92,9 @@ opendaylight: - service: opendaylight {%- endif %} diff --git a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch index 083cf37d..083cf37d 100644 --- a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch diff --git a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch deleted file mode 100644 index cc41beb6..00000000 --- a/patches/opnfv-fuel/0010-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ /dev/null @@ -1,61 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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: diff --git a/patches/opnfv-fuel/0012-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch index 3432e857..3432e857 100644 --- a/patches/opnfv-fuel/0012-Revert-Get-back-to-the-GA-kernel.patch +++ b/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch diff --git a/upstream/fuel b/upstream/fuel -Subproject 7f47d25bc3a25ad2cdd564100cdc703ae85702b +Subproject 360e605cda3e6bdeceb06cc0528c1cc0e6e60ed |