From 7eca70b1a6dfe58288dcdeae12c99dfab69f890c Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 24 Feb 2015 00:32:03 -0700 Subject: A functional libvirt + nova_compute + nova_network This imports sdakes' nova-docker codebase to show that atomic upgrades work atleast with nova networking. This has many corrections. For more details read: http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/ Implements-blueprint: blueprint libvirt-container Partially-implements; blueprint container-set-compute-operation-nova Change-Id: I858ea113c5656b6da5d2fd13502fecdbd085c8da --- docker/nova-compute/nova-libvirt/Dockerfile | 14 ++------------ docker/nova-compute/nova-libvirt/start.sh | 12 +----------- 2 files changed, 3 insertions(+), 23 deletions(-) (limited to 'docker/nova-compute/nova-libvirt') diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile index aa49fcb7c..0a7a7439a 100644 --- a/docker/nova-compute/nova-libvirt/Dockerfile +++ b/docker/nova-compute/nova-libvirt/Dockerfile @@ -1,18 +1,8 @@ FROM kollaglue/fedora-rdo-base MAINTAINER Kolla Project (https://launchpad.net/kolla) -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/ +RUN yum -y install libvirtd libguestfs qemu-system-x86 \ + libvirt-daemon-config-nwfilter; yum clean all VOLUME [ "/sys/fs/cgroup" ] VOLUME [ "/var/lib/nova" ] diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh index 64785da7d..740f67f67 100755 --- a/docker/nova-compute/nova-libvirt/start.sh +++ b/docker/nova-compute/nova-libvirt/start.sh @@ -1,13 +1,3 @@ #!/bin/sh -/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 +exec /usr/sbin/libvirtd -- cgit v1.2.3