diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-14 10:58:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-14 10:58:08 +0000 |
| commit | 0545701d0d4bfda60a5e4459a6bd3ef58887075b (patch) | |
| tree | e6cff85ddc427a059a5a1efb17a276f1cfc7f0fe /docker/nova | |
| parent | e47d4b8506e990c3f466676a1108de1d1b7ece40 (diff) | |
| parent | 1353538644253081f62a6a74e299d102aa9965dd (diff) | |
| download | kolla-0545701d0d4bfda60a5e4459a6bd3ef58887075b.tar.gz kolla-0545701d0d4bfda60a5e4459a6bd3ef58887075b.zip | |
Merge "Make Ceph work for RPM based distributions"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index e86440ed1..2723ba711 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -8,6 +8,7 @@ RUN yum -y install \ openstack-nova-compute \ openvswitch \ sysfsutils \ + ceph-common \ && yum clean all {% endif %} @@ -19,6 +20,7 @@ RUN yum -y install \ openvswitch \ qemu-img \ sysfsutils \ + ceph-common \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 514c49d49..29222da4e 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -10,6 +10,7 @@ RUN yum -y install \ libvirt-daemon-driver-nwfilter \ libvirt-daemon-config-nwfilter \ libvirt-daemon-driver-lxc \ + ceph-common \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} |