Set libvirt unix_sock_group as an option

Updated libvirt formula now supports group
name as an option for unix socket parameter.

Change-Id: I683e38971fe6c939fd09e95b805d611ddc596f28
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

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
deleted file mode 100644 (file)
index 715ddc0..0000000
--- a/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2017 Mirantis Inc., 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 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 d16e3c2..56c3f1c 100644 (file)
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -15,4 +15,3 @@
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.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

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
index f413aef..c3d9b14 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
@@ -40,6 +40,7 @@ parameters:
     server:
       service: libvirtd
       config_sys: /etc/default/libvirtd
+      unix_sock_group: libvirt
   salt:
     control:
       size:  # RAM 4096,8192,16384,32768,65536

diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 74f5df2..f3ef0fc 160000 (submodule)
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 74f5df259264c330637120ace4652c3a25aae255
+Subproject commit f3ef0fc2b794c7cf648f4be884954b827efe16f2