From c49613ad0a4ec1793819c8f6c4780fbaa224ad4f Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Fri, 20 Mar 2015 22:00:54 +0000 Subject: [PATCH] Refactors nwfilter Previously, the nwfilter daemon/conf pkgs would need to be installed on the host. Compose would then mount the host DIR to the compute containers. A more efficient approach is to simply install the nwfilter config/daemon in the libvirt container. Both appoaches address the following error when booting an instance: 'no-mac-spoofing' is missing Change-Id: I81b446d198920473bf99b97ef5eac6ef5ee85024 --- compose/nova-compute-network.yml | 3 --- docker/nova-compute/nova-compute/Dockerfile | 4 ++-- docker/nova-compute/nova-libvirt/Dockerfile | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml index 79aeffed35..c9efa5fb20 100644 --- a/compose/nova-compute-network.yml +++ b/compose/nova-compute-network.yml @@ -13,7 +13,6 @@ libvirt: - /var/lib/nova:/var/lib/nova - /var/lib/libvirt:/var/lib/libvirt - /etc/libvirt/qemu:/etc/libvirt/qemu - - /etc/libvirt/nwfilter:/etc/libvirt/nwfilter novanetwork: image: kollaglue/centos-rdo-nova-network @@ -28,7 +27,6 @@ novanetwork: - /sys/fs/cgroup:/sys/fs/cgroup - /var/lib/nova:/var/lib/nova - /var/lib/libvirt:/var/lib/libvirt - - /etc/libvirt/nwfilter:/etc/libvirt/nwfilter novacompute: image: kollaglue/centos-rdo-nova-compute @@ -44,4 +42,3 @@ novacompute: - /var/lib/nova:/var/lib/nova - /var/lib/libvirt:/var/lib/libvirt - /etc/libvirt/qemu:/etc/libvirt/qemu - - /etc/libvirt/nwfilter:/etc/libvirt/nwfilter diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile index 8ef95eddc9..6e24c456e9 100644 --- a/docker/nova-compute/nova-compute/Dockerfile +++ b/docker/nova-compute/nova-compute/Dockerfile @@ -1,8 +1,8 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) -RUN yum -y install openstack-nova-compute sysfsutils \ - libvirt-daemon-config-nwfilter ; yum clean all +RUN yum -y install openstack-nova-compute \ + sysfsutils ; yum clean all ADD config-nova-compute.sh /opt/kolla/config-nova-compute.sh diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile index 7de4543f72..bc64e10021 100644 --- a/docker/nova-compute/nova-libvirt/Dockerfile +++ b/docker/nova-compute/nova-libvirt/Dockerfile @@ -2,6 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install libvirtd libguestfs qemu-system-x86 \ + libvirt-daemon-driver-nwfilter \ libvirt-daemon-config-nwfilter; yum clean all VOLUME [ "/sys/fs/cgroup" ]