aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-08-22 16:49:51 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-08-24 16:14:04 +0800
commit2a1c25d6e3ba9c96deb82f4329898246784af6a0 (patch)
tree99be8b73f2b917803a672edfe70b67078a996ae1 /docker/keystone
parent755d5172b325fbfebb80df64a63d6faf653c3390 (diff)
downloadkolla-2a1c25d6e3ba9c96deb82f4329898246784af6a0.tar.gz
kolla-2a1c25d6e3ba9c96deb82f4329898246784af6a0.zip
Fix Ubuntu binary build and deploy gate
Signed-off-by: Jeffrey Zhang <jeffrey.zhang@99cloud.net> Closes-Bug: #1616349 Change-Id: I82a245474392d22017faf30fa89d6dc5e01ab2c2
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' %}