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/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.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/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch')
-rw-r--r-- | patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch deleted file mode 100644 index 3411aad9..00000000 --- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch +++ /dev/null @@ -1,58 +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, 20 Aug 2017 18:18:53 +0200 -Subject: [PATCH] libvirt: Use "libvirt" unix_sock_group - -On AArch64, libvirt 3.x is used, which uses "libvirt" by default, -so change old "libvirtd" in <libvirt/files/libvirtd.conf.Debian>. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ...libvirt-unix_sock_group-s-libvirtd-libvirt.patch | 21 +++++++++++++++++++++ - mcp/patches/patches.list | 1 + - 2 files changed, 22 insertions(+) - create mode 100644 mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch - -diff --git a/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch -new file mode 100644 -index 0000000..003b249 ---- /dev/null -+++ b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch -@@ -0,0 +1,21 @@ -+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -+Date: Sun, 20 Aug 2017 02:03:01 +0200 -+Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/ -+ -+On AArch64, libvirt 3.x is used, which uses "libvirt" by default. -+ -+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -+--- -+ -+diff --git a/libvirt/files/libvirtd.conf.Debian b/libvirt/files/libvirtd.conf.Debian -+--- a/libvirt/files/libvirtd.conf.Debian -++++ b/libvirt/files/libvirtd.conf.Debian -+@@ -81,7 +81,7 @@ -+ # without becoming root. -+ # -+ # This is restricted to 'root' by default. -+-unix_sock_group = "libvirtd" -++unix_sock_group = "libvirt" -+ -+ # Set the UNIX socket permissions for the R/O socket. This is used -+ # for monitoring VM status only -diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 7c5bf15..218ed51 100644 ---- a/mcp/patches/patches.list -+++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ - /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch - /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch - /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch -+/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch |