patches: libvirt: Use "libvirt" unix_sock_group

Now that libvirt 3.6 is used on kvm nodes (via UCA repos), which
by default uses "libvirt" group for socket ownership,
change old "libvirtd" in salt-formula-libvirt's:
- libvirt/files/libvirtd.conf.Debian

This allows us to remove the manual group creation from VCP state
file, which was not re-entrant (failed if group already existed).

Change-Id: Id61fecd82daec1c0716ff4796b79dce47d096c3a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index d92e992..3856bef 100755 (executable)
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -27,8 +27,6 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
 fi
 
 # KVM libvirt first, VCP deployment
-#FIXME Should be removed once upstream patch get merged
-salt -C 'kvm*' group.add libvirtd
 wait_for 5 "salt -C 'kvm*' state.sls libvirt"
 
 salt -C 'kvm* or cmp*' state.apply salt

diff --git a/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
new file mode 100644 (file)
index 0000000..1ac6cd1
--- /dev/null
+++ b/mcp/patches/0013-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/
+
+For Pike, 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 fcbd3ae..00b1145 100644 (file)
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -16,3 +16,4 @@
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /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: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch