aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-24 11:46:27 +0000
committerGerrit Code Review <review@openstack.org>2016-08-24 11:46:27 +0000
commit0d661a1e59c6557448dbf3ff9d48c50a7a54524d (patch)
tree975a728abd196cc1995be1d63c96265d535d679c /docker/keystone
parentd8755e173ff6744e13fa73cbc4ed6b384c51a3e3 (diff)
parent2a1c25d6e3ba9c96deb82f4329898246784af6a0 (diff)
downloadkolla-0d661a1e59c6557448dbf3ff9d48c50a7a54524d.tar.gz
kolla-0d661a1e59c6557448dbf3ff9d48c50a7a54524d.zip
Merge "Fix Ubuntu binary build and deploy gate"
Diffstat (limited to 'docker/keystone')
-rw-r--r--docker/keystone/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index d499dbbaf..e4a37baab 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -32,7 +32,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \
- && echo > /etc/apache2/ports.conf
+ && echo > /etc/apache2/ports.conf \
+ && rm /etc/apache2/sites-enabled/keystone.conf
{% endif %}
{% elif install_type == 'source' %}