Browse code

put libvirt debug in the right place

libvirt debug setting was happening in a place where we weren't
actually resetting the daemon. Move it to into the hypervisor
plugin where we do.

Change-Id: Ia79b0ef50f6b8fb007a20ce5cb4e510a5e4600a5

Sean Dague authored on 2014/03/11 00:27:23
Showing 2 changed files
... ...
@@ -665,17 +665,6 @@ function start_nova_compute {
665 665
     fi
666 666
 
667 667
     if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
668
-        # Enable client side traces for libvirt
669
-        local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util"
670
-        local log_outputs="1:file:/var/log/libvirt/libvirtd.log"
671
-        # Enable server side traces for libvirtd
672
-        if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
673
-            echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
674
-        fi
675
-        if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
676
-            echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
677
-        fi
678
-
679 668
         # The group **$LIBVIRT_GROUP** is added to the current user in this script.
680 669
         # Use 'sg' to execute nova-compute as a member of the **$LIBVIRT_GROUP** group.
681 670
         screen_it n-cpu "cd $NOVA_DIR && sg $LIBVIRT_GROUP '$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf'"
... ...
@@ -103,6 +103,16 @@ EOF
103 103
     fi
104 104
     add_user_to_group $STACK_USER $LIBVIRT_GROUP
105 105
 
106
+    # Enable server side traces for libvirtd
107
+    local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util"
108
+    local log_outputs="1:file:/var/log/libvirt/libvirtd.log"
109
+    if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
110
+        echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
111
+    fi
112
+    if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
113
+        echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
114
+    fi
115
+
106 116
     # libvirt detects various settings on startup, as we potentially changed
107 117
     # the system configuration (modules, filesystems), we need to restart
108 118
     # libvirt to detect those changes.