diff options
Diffstat (limited to 'patches/reclass-system-salt-model')
3 files changed, 0 insertions, 130 deletions
diff --git a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch deleted file mode 100644 index 43d1e6a2..00000000 --- a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch +++ /dev/null @@ -1,67 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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: Mon, 10 Jul 2017 15:31:08 +0000 -Subject: [PATCH] linux.system.repo.mcp: Add Armband repos - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - linux/system/repo/mcp/armband/extra.yml | 14 ++++++++++++++ - linux/system/repo/mcp/armband/openstack.yml | 21 +++++++++++++++++++++ - 2 files changed, 35 insertions(+) - create mode 100644 linux/system/repo/mcp/armband/extra.yml - create mode 100644 linux/system/repo/mcp/armband/openstack.yml - -diff --git a/linux/system/repo/mcp/armband/extra.yml b/linux/system/repo/mcp/armband/extra.yml -new file mode 100644 -index 0000000..5b10e19 ---- /dev/null -+++ b/linux/system/repo/mcp/armband/extra.yml -@@ -0,0 +1,14 @@ -+parameters: -+ # Armband only provides apt_mk_version=nightly for now -+ linux: -+ system: -+ repo: -+ armband_mcp_extra: -+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra" -+ architectures: arm64 -+ key_url: "https://linux.enea.com/apt-mk/public.gpg" -+ clean_file: true -+ pin: -+ - pin: 'release a=nightly' -+ priority: 1100 -+ package: '*' -diff --git a/linux/system/repo/mcp/armband/openstack.yml b/linux/system/repo/mcp/armband/openstack.yml -new file mode 100644 -index 0000000..6aa4fa0 ---- /dev/null -+++ b/linux/system/repo/mcp/armband/openstack.yml -@@ -0,0 +1,21 @@ -+parameters: -+ # Armband only provides apt_mk_version=nightly for now -+ linux: -+ system: -+ repo: -+ armband_openstack: -+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" -+ architectures: arm64 -+ key_url: "https://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" -+ pin: -+ - pin: 'release a=${_param:openstack_version}' -+ priority: 1100 -+ package: '*' -+ armband_mk_openstack: -+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly ${_param:openstack_version}" -+ architectures: arm64 -+ key_url: "https://linux.enea.com/apt-mk/public.gpg" -+ pin: -+ - pin: 'release a=nightly' -+ priority: 1100 -+ package: '*' diff --git a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch b/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch deleted file mode 100644 index 1c33a3a8..00000000 --- a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch +++ /dev/null @@ -1,34 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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: Fri, 14 Jul 2017 19:26:11 +0000 -Subject: [PATCH] linux.system: AArch64: Remove mcelog - -mcelog is not available on AArch64 hardware, so skip trying to install -it. This implies Ceilometer should not use mcelog on AArch64. - -Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - linux/system/single/init.yml | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml -index 8de2dda..c702a48 100644 ---- a/linux/system/single/init.yml -+++ b/linux/system/single/init.yml -@@ -19,8 +19,6 @@ parameters: - version: purged - unattended-upgrades: - version: purged -- mcelog: -- version: latest - kernel: - modules: - - nf_conntrack diff --git a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch b/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch deleted file mode 100644 index 65578721..00000000 --- a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch +++ /dev/null @@ -1,29 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 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: Sun, 26 Nov 2017 17:55:13 +0100 -Subject: [PATCH] linux.system.repo.glusterfs: Add arm64 arch - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - linux/system/repo/glusterfs.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml -index fb331f0..ffad938 100644 ---- a/linux/system/repo/glusterfs.yml -+++ b/linux/system/repo/glusterfs.yml -@@ -6,6 +6,6 @@ parameters: - repo: - glusterfs-ppa: - source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: 3FE869A9 - key_server: keyserver.ubuntu.com |