aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-17 19:46:47 +0000
committerGerrit Code Review <review@openstack.org>2015-08-17 19:46:47 +0000
commitb8296c7ca9b68a27d7f95d0a45bbc4a92efb6cdd (patch)
tree42d8ad617a56cbba50463fcefb3b5a1d10405f71
parentdeab6136698aa1de9359c548faed84e019a98824 (diff)
parenta765e6a7082b3e058ab1a63618147024ea0a4ed5 (diff)
downloadkolla-b8296c7ca9b68a27d7f95d0a45bbc4a92efb6cdd.tar.gz
kolla-b8296c7ca9b68a27d7f95d0a45bbc4a92efb6cdd.zip
Merge "Make cinder build from source"
-rw-r--r--docker_templates/cinder/cinder-base/Dockerfile.j21
1 files changed, 0 insertions, 1 deletions
diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker_templates/cinder/cinder-base/Dockerfile.j2
index 6f3238c78..6e34a3f2f 100644
--- a/docker_templates/cinder/cinder-base/Dockerfile.j2
+++ b/docker_templates/cinder/cinder-base/Dockerfile.j2
@@ -25,7 +25,6 @@ RUN cd /cinder \
&& pip install /cinder \
&& mkdir /etc/cinder /var/log/cinder \
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
- && cp /etc/cinder/cinder.conf.sample /etc/cinder/cinder.conf \
&& chown -R cinder: /etc/cinder /var/log/cinder \
&& rm -rf /root/.cache