openstack/kolla-ansible
Code Issues Proposed changes

Merge "Refactors nwfilter"

Browse Source
This commit is contained in:
Jenkins 2015-03-21 03:16:24 +00:00 committed by Gerrit Code Review
commit ad6026e0e1
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compose/nova-compute-network.yml
View File

@ -13,7 +13,6 @@ libvirt:
- /var/lib/nova:/var/lib/nova - /var/lib/nova:/var/lib/nova
- /var/lib/libvirt:/var/lib/libvirt - /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu - /etc/libvirt/qemu:/etc/libvirt/qemu
- /etc/libvirt/nwfilter:/etc/libvirt/nwfilter
novanetwork: novanetwork:
image: kollaglue/centos-rdo-nova-network image: kollaglue/centos-rdo-nova-network
@ -28,7 +27,6 @@ novanetwork:
- /sys/fs/cgroup:/sys/fs/cgroup - /sys/fs/cgroup:/sys/fs/cgroup
- /var/lib/nova:/var/lib/nova - /var/lib/nova:/var/lib/nova
- /var/lib/libvirt:/var/lib/libvirt - /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/nwfilter:/etc/libvirt/nwfilter
novacompute: novacompute:
image: kollaglue/centos-rdo-nova-compute image: kollaglue/centos-rdo-nova-compute
@ -44,4 +42,3 @@ novacompute:
- /var/lib/nova:/var/lib/nova - /var/lib/nova:/var/lib/nova
- /var/lib/libvirt:/var/lib/libvirt - /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu - /etc/libvirt/qemu:/etc/libvirt/qemu
- /etc/libvirt/nwfilter:/etc/libvirt/nwfilter

4
docker/nova-compute/nova-compute/Dockerfile
View File

@ -1,8 +1,8 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute sysfsutils \ RUN yum -y install openstack-nova-compute \
libvirt-daemon-config-nwfilter ; yum clean all sysfsutils ; yum clean all
ADD config-nova-compute.sh /opt/kolla/config-nova-compute.sh ADD config-nova-compute.sh /opt/kolla/config-nova-compute.sh

1
docker/nova-compute/nova-libvirt/Dockerfile
View File

@ -2,6 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install libvirtd libguestfs qemu-system-x86 \ RUN yum -y install libvirtd libguestfs qemu-system-x86 \
libvirt-daemon-driver-nwfilter \
libvirt-daemon-config-nwfilter; yum clean all libvirt-daemon-config-nwfilter; yum clean all
VOLUME [ "/sys/fs/cgroup" ] VOLUME [ "/sys/fs/cgroup" ]