Merge "Unify Centos and Ubuntu Source Install - Keystone"

This commit is contained in:
Jenkins 2015-08-27 16:39:05 +00:00 committed by Gerrit Code Review
commit 79773a3d6b

View File

@ -48,17 +48,15 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
ADD ./keystone.tar /
RUN ln -s /keystone-* /keystone
RUN cd /keystone \
ADD keystone.tar /
RUN ln -s /keystone-* keystone \
&& useradd --user-group keystone \
&& pip install -r requirements.txt \
&& pip install --install-option="--install-scripts=/usr/bin" /keystone \
&& pip --no-cache-dir install /keystone \
&& mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \
&& cp -r /keystone/etc/* /etc/keystone/ \
&& cp -a httpd/keystone.py /var/www/cgi-bin/keystone/admin \
&& cp -a httpd/keystone.py /var/www/cgi-bin/keystone/main
&& cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/admin \
&& cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/main \
&& chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone
{% endif %}