diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-21 15:05:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-21 15:05:03 +0000 |
| commit | fb54a89bde8bd09ea417a9ab10218a8c51a99149 (patch) | |
| tree | 167b148c67612e1de7d8f8e198be968295f1baad | |
| parent | e00dc579c11434e46d49c2951d7bf8333bd6a534 (diff) | |
| parent | f92151465b84164933e7660d9a9e91da9226bd5a (diff) | |
| download | kolla-fb54a89bde8bd09ea417a9ab10218a8c51a99149.tar.gz kolla-fb54a89bde8bd09ea417a9ab10218a8c51a99149.zip | |
Merge "Fix cinder create volume from image with kolla source build"
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/cinder_sudoers | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index a679a0b82..5fecd137d 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -17,13 +17,16 @@ RUN yum -y install openstack-cinder \ {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install lvm2 \ +RUN yum -y install \ + lvm2 \ + qemu-img \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ lvm2 \ + qemu-utils \ ceph-common \ && apt-get clean \ && mkdir -p /etc/ceph @@ -38,6 +41,10 @@ RUN ln -s cinder-base-source/* cinder \ && cp -r /cinder/etc/cinder/* /etc/cinder/ \ && chown -R cinder: /etc/cinder /var/log/cinder /var/lib/cinder /home/cinder +COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers +RUN chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/cinder_sudoers + {% endif %} RUN usermod -a -G kolla cinder diff --git a/docker/cinder/cinder-base/cinder_sudoers b/docker/cinder/cinder-base/cinder_sudoers new file mode 100644 index 000000000..3750f31a0 --- /dev/null +++ b/docker/cinder/cinder-base/cinder_sudoers @@ -0,0 +1 @@ +cinder ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * |