diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-07 18:03:26 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-13 05:08:15 +0100 |
commit | 466a4c3252e17370ed4d9d7c854738b26dbf1df1 (patch) | |
tree | 1651ed356e75d9b93575c1ef785d0edd2fb7a6e4 /patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch | |
parent | c952e48d895d963b9381b22fca5914849ba4cfac (diff) |
u/fuel: Bump & rebase for Pike upgrade
- virtual deploys will use only UCA repos, without Armband/MCP;
- base image pre-build is now upstream, drop our patches;
- drop p/fuel libvirtd group workaround, now upstream in Fuel@OPNFV;
- drop p/reclass glusterfs PPA arch extension, obsolete;
- refactor armband repos in system.repo.mcp into:
* armband (new, contains kernel, libvirt etc.);
* armband_openstack (move into system.repo.mcp.openstack);
* armband_mk_openstack (move intro system.repo.mcp.openstack);
* armband_mcp_extra (move into system.repo.mcp.extra);
- drop 'nova: Update console defaults for armv7, aarch64';
- minor rebase of nova libvirt driver patches in our roll-up;
JIRA: ARMBAND-335
Change-Id: Ic5b7736cdd1d1ad5ff25728925198e8ea3e6b5b1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch')
-rw-r--r-- | patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch | 8 |
1 files changed, 4 insertions, 4 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 1c33a3a8..5d344dd8 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 @@ -20,7 +20,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 2 deletions(-) diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml -index 8de2dda..c702a48 100644 +index c7c583b..764dfe3 100644 --- a/linux/system/single/init.yml +++ b/linux/system/single/init.yml @@ -19,8 +19,6 @@ parameters: @@ -29,6 +29,6 @@ index 8de2dda..c702a48 100644 version: purged - mcelog: - version: latest - kernel: - modules: - - nf_conntrack + apt: + config: + compression-workaround: |