diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-21 03:16:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-21 03:16:24 +0000 |
| commit | ad6026e0e11ab015218fa3e19206b42652d16da9 (patch) | |
| tree | 0ddf211a11821b80e1010c7b52b41b5d0d3800d8 | |
| parent | 68978c2338efc08f9cfa2ec9f272fd15faa885e0 (diff) | |
| parent | c49613ad0a4ec1793819c8f6c4780fbaa224ad4f (diff) | |
| download | kolla-ad6026e0e11ab015218fa3e19206b42652d16da9.tar.gz kolla-ad6026e0e11ab015218fa3e19206b42652d16da9.zip | |
Merge "Refactors nwfilter"
| -rw-r--r-- | compose/nova-compute-network.yml | 3 | ||||
| -rw-r--r-- | docker/nova-compute/nova-compute/Dockerfile | 4 | ||||
| -rw-r--r-- | 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 79aeffed3..c9efa5fb2 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 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" ] |