Merge "Fix cinder-api ubuntu binary" into stable/ocata

This commit is contained in:
Jenkins 2017-06-07 09:20:05 +00:00 committed by Gerrit Code Review
commit 744b44add5
1 changed files with 8 additions and 1 deletions

View File

@ -21,7 +21,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
RUN mkdir -p /var/www/cgi-bin/cinder \
&& cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
&& echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %}
@ -49,4 +51,9 @@ RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start
{% block cinder_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{% if install_type == 'binary' and base_distro in ['debian', 'ubuntu'] %}
RUN chown -R cinder: /var/www/cgi-bin/cinder \
&& chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi
{% else %}
USER cinder
{% endif %}