From 7938017cfc501b9809d8ce95da614c7f7e849d5d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 20 Aug 2017 18:18:53 +0200 Subject: 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 --- mcp/config/states/virtual_control_plane | 2 -- 1 file changed, 2 deletions(-) (limited to 'mcp/config') diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index d92e99232..3856bef10 100755 --- 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 -- cgit 1.2.3-korg