1. devstack
  2. Commit 76cbbe37aae5d54542d62a5c6deec428a8cdc75e
Browse code

libvirt: don't repeatedly configure libvirtd logging

/etc/libvirt is not world-readable (at least on Fedora and RHEL) so
use sudo with the grep that checks whether we have already configured
libvirtd logging. Also, change the regex so we don't count commented
out logging config.

Change-Id: I67484b28aafd0fa828385321fa96d9141cb4cb59
Signed-off-by: Mark McLoughlin <markmc@redhat.com>

Mark McLoughlin authored on 2015/12/07 19:05:04
Showing 1 changed files
lib/nova_plugins/functions-libvirt
History View file @ 76cbbe3
... ... 
@@ -110,10 +110,10 @@ EOF
110 110 
             local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:object 3:event 3:json 3:file 1:util 1:qemu_monitor"
111 111 
         fi
112 112 
         local log_outputs="1:file:/var/log/libvirt/libvirtd.log"
113 
-        if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
113 
+        if ! sudo grep -q "^log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
114 114 
             echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
115 115 
         fi
116 
-        if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
116 
+        if ! sudo grep -q "^log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
117 117 
             echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
118 118 
         fi
119 119 
     fi