diff options
| author | Steven Dake <sdake@redhat.com> | 2014-10-07 11:20:26 -0700 |
|---|---|---|
| committer | Steven Dake <sdake@redhat.com> | 2014-10-07 11:20:26 -0700 |
| commit | 727d8d139ce7f7f3fd87547f755b9f48c56a405e (patch) | |
| tree | 19126fba89c3a5b15ad3b00d88dee655fbd4c276 | |
| parent | 6dbd9c470a829e771455883e9cf68490fd31072f (diff) | |
| download | kolla-727d8d139ce7f7f3fd87547f755b9f48c56a405e.tar.gz kolla-727d8d139ce7f7f3fd87547f755b9f48c56a405e.zip | |
Get to a functional nova-libvirt start
Get a working Dockerfile
Sort out start.sh to run libvirt in a container
Change-Id: Iaafe807b1631ad59fea200a02e46a8cabd6791ca
| -rw-r--r-- | docker/nova-compute/nova-libvirt/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/nova-compute/nova-libvirt/start.sh | 13 |
2 files changed, 26 insertions, 3 deletions
diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile index b5b70b1e2..a37d97cff 100644 --- a/docker/nova-compute/nova-libvirt/Dockerfile +++ b/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"] diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh index 0fe90e1a4..64785da7d 100644 --- a/docker/nova-compute/nova-libvirt/start.sh +++ b/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 |