aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-06 03:51:00 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-06 03:51:00 +0100
commitfe96c75af5819311c52be14bc9236f10df6e34ed (patch)
tree864cddd7e2644da4865254a87824c58ad0fdaa15
parent571e23d8f43861130fc88b6462f18808cc8808ca (diff)
p/reclass-system: Rebase mcelog removal patch
Change-Id: I2d45fc36f07bddad7574a632e58d14f9b4fdbdbd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch24
-rw-r--r--patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch2
2 files changed, 13 insertions, 13 deletions
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
index 5d344dd..859caea 100644
--- 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
@@ -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
@@ -16,19 +16,19 @@ 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 --
+ linux/system/single/debian.yml | 2 --
1 file changed, 2 deletions(-)
-diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml
-index c7c583b..764dfe3 100644
---- a/linux/system/single/init.yml
-+++ b/linux/system/single/init.yml
-@@ -19,8 +19,6 @@ parameters:
- version: purged
- unattended-upgrades:
+diff --git a/linux/system/single/debian.yml b/linux/system/single/debian.yml
+index b4d08c9..ef8266a 100644
+--- a/linux/system/single/debian.yml
++++ b/linux/system/single/debian.yml
+@@ -10,8 +10,6 @@ parameters:
+ version: latest
+ cloud-init:
version: purged
- mcelog:
- version: latest
- apt:
- config:
- compression-workaround:
+ python-msgpack:
+ version: latest
+ unattended-upgrades:
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
index 6557872..a595509 100644
--- 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
@@ -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