Merge "Refactors nwfilter"

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

docker/nova-compute/nova-compute/Dockerfile

 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
 

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