summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-19 17:59:53 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-19 18:04:14 +0400
commit0d39b12184b63e155b338fff84115fef2a3f905a (patch)
treef3dc167d87e51862fb566f48ab23dc22eb883568
parent5ceea06b5395115e0e45d0631e726062eb1b0d13 (diff)
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>
-rw-r--r--mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch29
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml1
m---------mcp/reclass/classes/system0
4 files changed, 1 insertions, 30 deletions
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
index 715ddc042..000000000
--- 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 d16e3c207..56c3f1c44 100644
--- 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 f413aef38..c3d9b1496 100644
--- 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
-Subproject 74f5df259264c330637120ace4652c3a25aae25
+Subproject f3ef0fc2b794c7cf648f4be884954b827efe16f