aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDaneyon Hansen <danehans@cisco.com>2015-03-20 22:00:54 +0000
committerDaneyon Hansen <danehans@cisco.com>2015-03-20 22:00:54 +0000
commitc49613ad0a4ec1793819c8f6c4780fbaa224ad4f (patch)
tree08222eba586cc386b3c8297dad5e05154feafa03 /docker
parent5bfc3e11f6d36204d88e085d9ed9df6c941f7dd2 (diff)
downloadkolla-c49613ad0a4ec1793819c8f6c4780fbaa224ad4f.tar.gz
kolla-c49613ad0a4ec1793819c8f6c4780fbaa224ad4f.zip
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
Diffstat (limited to 'docker')
-rw-r--r--docker/nova-compute/nova-compute/Dockerfile4
-rw-r--r--docker/nova-compute/nova-libvirt/Dockerfile1
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile
index 8ef95eddc..6e24c456e 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 7de4543f7..bc64e1002 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" ]