summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-07 09:20:05 +0000
committerGerrit Code Review <review@openstack.org>2017-06-07 09:20:05 +0000
commit744b44add5ff07782c97e658871b160c8eb04d78 (patch)
tree942bbe576231c9eacecf18e125430786bd67e9e2
parent2d123deecc6952be814f9bb87194a967f4a650e9 (diff)
parent6a1629b0a70e80dd230fc5d363491dd3ab3e0354 (diff)
Merge "Fix cinder-api ubuntu binary" into stable/ocata
-rw-r--r--docker/cinder/cinder-api/Dockerfile.j29
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 6c6800f..4ce23c0 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -21,7 +21,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
21 'libapache2-mod-wsgi' 21 'libapache2-mod-wsgi'
22 ] %} 22 ] %}
23{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} 23{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
24RUN echo > /etc/apache2/ports.conf 24RUN mkdir -p /var/www/cgi-bin/cinder \
25 && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
26 && echo > /etc/apache2/ports.conf
25 {% endif %} 27 {% endif %}
26 28
27{% elif install_type == 'source' %} 29{% elif install_type == 'source' %}
@@ -49,4 +51,9 @@ RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start
49{% block cinder_api_footer %}{% endblock %} 51{% block cinder_api_footer %}{% endblock %}
50{% block footer %}{% endblock %} 52{% block footer %}{% endblock %}
51 53
54{% if install_type == 'binary' and base_distro in ['debian', 'ubuntu'] %}
55RUN chown -R cinder: /var/www/cgi-bin/cinder \
56 && chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi
57{% else %}
52USER cinder 58USER cinder
59{% endif %}