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
This commit is contained in:
Daneyon Hansen 2015-03-20 22:00:54 +00:00
parent 5bfc3e11f6
commit c49613ad0a
3 changed files with 3 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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" ]