2 files changed, 30 insertions, 2 deletions
diff --git a/docker_templates/nova/nova-libvirt/config-external.sh b/docker_templates/nova/nova-libvirt/config-external.sh
index cdcc6cc68..acc1c5473 120000..100755
--- a/docker_templates/nova/nova-libvirt/config-external.sh
+++ b/docker_templates/nova/nova-libvirt/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/nova/nova-libvirt/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/libvirt/libvirtd.conf"
+TARGET="/etc/libvirt/libvirtd.conf"
+OWNER="libvirt"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker_templates/nova/nova-libvirt/start.sh
index 8188547e1..ae0de867b 120000..100755
--- a/docker_templates/nova/nova-libvirt/start.sh
+++ b/docker_templates/nova/nova-libvirt/start.sh
@@ -1 +1,20 @@
-../../../docker/common/nova/nova-libvirt/start.sh
-\ No newline at end of file
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/sbin/libvirtd"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+# TODO(SamYaple): Tweak libvirt.conf rather than change permissions.
+# Fix permissions for libvirt
+if [[ -c /dev/kvm ]]; then
+    chmod 660 /dev/kvm
+    chown root:kvm /dev/kvm
+fi
+
+exec $CMD $ARGS