aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/cinder/cinder-api/Dockerfile.j29
-rw-r--r--docker/cinder/cinder-api/extend_start.sh12
2 files changed, 20 insertions, 1 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index bd9cc931e..8121a6b13 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -23,7 +23,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' %}
@@ -53,4 +55,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 %}
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index 176515189..d6709fd59 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/docker/cinder/cinder-api/extend_start.sh
@@ -7,3 +7,15 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
cinder-manage db sync
exit 0
fi
+
+if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then
+ if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+ # Loading Apache2 ENV variables
+ . /etc/apache2/envvars
+ rm -rf /var/run/apache2/*
+ APACHE_DIR="apache2"
+ else
+ rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
+ APACHE_DIR="httpd"
+ fi
+fi