Merge "nova-kvm: configure /etc/sysconfig/libvirtd"

elements/nova-kvm/install.d/81-nova-kvm

@@ -6,3 +6,14 @@ set -eux
 # collision with the network on the seed host machine
 rm -f /etc/libvirt/qemu/networks/autostart/default.xml
 rm -f /etc/libvirt/qemu/networks/default.xml
+
+SCRIPTDIR=$(dirname $0)
+
+if [ -f /etc/sysconfig/libvirtd ]; then
+    install -D -g root -o root -m 0755 ${SCRIPTDIR}/default_libvirtd /etc/sysconfig/libvirtd
+elif [ -f /etc/default/libvirt-bin ]; then
+    install -D -g root -o root -m 0755 ${SCRIPTDIR}/default_libvirt_bin /etc/default/libvirt-bin
+else
+    echo "Unsupported libvirtd/libvirt-bin configuration."
+    exit 1
+fi

elements/nova-kvm/install.d/default_libvirtd

@@ -0,0 +1,24 @@
+# Override the default config file
+# NOTE: This setting is no longer honoured if using
+# systemd. Set '--config /etc/libvirt/libvirtd.conf'
+# in LIBVIRTD_ARGS instead.
+#LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf
+
+# Listen for TCP/IP connections
+# NB. must setup TLS/SSL keys prior to using this
+LIBVIRTD_ARGS="--listen"
+
+# Override Kerberos service keytab for SASL/GSSAPI
+#KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+# Override the QEMU/SDL default audio driver probing when
+# starting virtual machines using SDL graphics
+#
+# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio
+# is enabled in /etc/libvirt/qemu.conf
+#QEMU_AUDIO_DRV=sdl
+#
+#SDL_AUDIODRIVER=pulse
+
+# Override the maximum number of opened files
+#LIBVIRTD_NOFILES_LIMIT=2048