openstack/kolla-ansible
Code Issues Proposed changes

Merge "Get to a functional nova-libvirt start"

Browse Source
This commit is contained in:
Jenkins 2014-10-07 18:29:55 +00:00 committed by Gerrit Code Review
commit 6ebb1a0be1
2 changed files with 26 additions and 3 deletions
docker/nova-compute/nova-libvirt
Dockerfilestart.sh

16
docker/nova-compute/nova-libvirt/Dockerfile

@ -1,8 +1,20 @@
FROM kollaglue/fedora-rdo-base
MAINTAINER Steven Dake <sdake@redhat.com>
RUN yum -y install libvirt \
libvirt-daemon-kvm && yum clean all
RUN yum -y install libvirt-daemon-driver-* libvirt-daemon libvirt-daemon-kvm qemu-kvm && yum clean all
EXPOSE 16509
RUN echo "listen_tls = 0" >> /etc/libvirt/libvirtd.conf; \
echo 'listen_tcp = 1' >> /etc/libvirt/libvirtd.conf; \
echo 'tls_port = "16514"' >> /etc/libvirt/libvirtd.conf; \
echo 'tcp_port = "16509"' >> /etc/libvirt/libvirtd.conf; \
echo 'auth_tcp = "none"' >> /etc/libvirt/libvirtd.conf
RUN echo 'LIBVIRTD_ARGS="--listen"' >> /etc/sysconfig/libvirtd
RUN mkdir -p /var/lib/libvirt/images/
VOLUME [ "/sys/fs/cgroup" ]
ADD ./start.sh /start.sh
CMD ["/start.sh"]

13
docker/nova-compute/nova-libvirt/start.sh

@ -1,2 +1,13 @@
#!/bin/sh
# placeholder for libvirt startup script
/bin/chmod 666 /dev/kvm
echo "Starting guests."
/usr/libexec/libvirt-guests.sh start
echo "Starting virtlockd."
/usr/sbin/virtlockd &
sleep 3
echo "Starting libvirtd."
exec /usr/sbin/libvirtd --listen