aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuhongjiang <andrew.lhj@gmail.com>2016-11-03 17:13:01 +0800
committerliuhongjiang <andrew.lhj@gmail.com>2016-11-03 05:53:11 -0400
commit6c2d02a614b00c8e38a0b760ceddd2f7f7cde958 (patch)
tree67e516a8b9c218b1dee4393748ffaf14b2d9e26c
parent9779778a1ebc99b6a48a8d97282bf4d2d8f473d7 (diff)
downloadkolla-6c2d02a614b00c8e38a0b760ceddd2f7f7cde958.tar.gz
kolla-6c2d02a614b00c8e38a0b760ceddd2f7f7cde958.zip
Changed the start script name in cinder-volume
In the Dockerfile of cinder-volume, the "kolla_extend_start" script will be overwritten, and it will cause the cinder-volume container doesn't create /var/log/kolla/cinder folder. The name of the start script should be "kolla_cinder_extend_start" in cinder-volume container. Change-Id: I7251792a4fbe1442e2ffc5ebd9e41bd9cdc33568 Closes-Bug: #1638839
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index fd4f1c6bb..6e5d275ed 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -44,11 +44,11 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% endif %}
COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
+COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/cinder_sudoers \
- && chmod 755 /usr/local/bin/kolla_extend_start
+ && chmod 755 /usr/local/bin/kolla_cinder_extend_start
{% block cinder_volume_footer %}{% endblock %}
{% block footer %}{% endblock %}