diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-21 16:33:46 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-25 20:11:18 +0000 |
| commit | 99c7eb1997c0be788a99aae433354ebce6b438d2 (patch) | |
| tree | 815a0c86a165d9c91fbad6e02f66ab7f879f8d60 /docker/nova/nova-libvirt | |
| parent | a1b0518b9a2d8c1e1ba188e10a55915eb49f6509 (diff) | |
| download | kolla-99c7eb1997c0be788a99aae433354ebce6b438d2.tar.gz kolla-99c7eb1997c0be788a99aae433354ebce6b438d2.zip | |
Make OpenStack use Ceph
This implements all the openstack pieces needed to make ceph work.
DocImpact
Change-Id: I1d24476a966602cf955e5ef872b0efb01319894a
Partially-Implements: blueprint ceph-container
Implements: blueprint kolla-live-migration
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 | ||||
| -rwxr-xr-x | docker/nova/nova-libvirt/start.sh | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index a238625c5..f296eb55c 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -15,12 +15,15 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ + ceph-common \ libvirt-bin \ dmidecode \ pm-utils \ qemu \ + qemu-block-extra \ ebtables \ - && apt-get clean + && apt-get clean \ + && mkdir -p /etc/ceph {% endif %} diff --git a/docker/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh index aa07f62dd..6191ce851 100755 --- a/docker/nova/nova-libvirt/start.sh +++ b/docker/nova/nova-libvirt/start.sh @@ -8,12 +8,5 @@ source /opt/kolla/kolla-common.sh python /opt/kolla/set_configs.py CMD=$(cat /run_command) -# TODO(SamYaple): Tweak libvirt.conf rather than change permissions. -# Fix permissions for libvirt -if [[ -c /dev/kvm ]]; then - chmod 660 /dev/kvm - chown root:kvm /dev/kvm -fi - echo "Running command: ${CMD}" exec $CMD |