summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-26 05:43:39 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-26 22:26:00 +0100
commit37083673d6cdddbb9b710f4dd5efe832753e5856 (patch)
treea0ef84e1ab70b5f1aca9254c3664847c056ab474 /patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
parentd8dd9847b7a534b3c78af1b3eb772f07a3543d0c (diff)
u/fuel: Bump & rebase for image pre-install
1. Bump to latest Fuel@OPNFV to include: - Bring in newer glusterfs for mtime unsplit brain * Requires adding arch "arm64" to PPA definition in reclass: - (reclass-system) linux.system.repo.glusterfs: Add arm64 arch - Switch nofeature-ha compute nodes to UCA repo * Requires an alternative way of adding linux.enea.com repos; * linux.enea.com repos will now be pre-install into VM images; * Requires refresh on repo arch list handled by Armband patch: - (fuel) baremetal, virtual: Extend arch list for UCA repo 2. Staging proposed patches from upstream Fuel@OPNFV: - Add pre-{install,purge} support for base image * Reference implementation adds pre-installed Armband specifics: - Enea public GPG to APT keys (for below repos); - repos (linux.enea.com/{apt-mk,mcp-repos}/*); - linux-{image,headers}-generic-hwe-16.04-edge; - cloud-init: datasource from NoCloud only; * Allows us to drop kernel installation from state files, installing the kernel only once during image prep, instead of two stages of parallel installs (5 baremetal, 14 VCP); * Ensures Armband repos are pre-configured for infrastructure VMs, allowing us to drop more reclass repo definitions; * Rework armband patch to install kernel only on kvm, cmp: - (fuel) baremetal: linux-image-generic-hwe-16.04-edge 3. Sync reclass repo definitions with upstream change, drop duplicates - [linux][repos] Remove unused repositories [1] * Upstream dropped all "ocata-{security,hotfix,...} repo comps, which are also empty for Armband, so drop them too; * Rework following armband patches: - (reclass-system) linux/system/repo/mcp: Add Armband repos * Move Armband repos to new dedicated reclass classes: - linux.system.repo.mcp.armband.extra (currently empty); - linux.system.repo.mcp.armband.openstack; * Use HTTPS for fetching Enea Armband GPG key; - (fuel) baremetal: Add Armband Openstack repos to kvm, cmp * Consume defs introduced above only on baremetal nodes; 4. Sync documentation with Fuel@OPNFV (cp) 5. Add vim swap files to .gitignore [1] https://github.com/Mirantis/reclass-system-salt-model/commit/1dd1b31 Change-Id: Ibab56279de86f08ad7cd9bc6761f4c525532f811 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.patch58
1 files changed, 58 insertions, 0 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
new file mode 100644
index 00000000..581cd71f
--- /dev/null
+++ b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch
@@ -0,0 +1,58 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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 4f6cc56..688a9af 100644
+--- a/mcp/patches/patches.list
++++ b/mcp/patches/patches.list
+@@ -19,3 +19,4 @@
+ /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+ /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.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