openstack/kolla-ansible
Code Issues Proposed changes

Unify Centos and Ubuntu Source Install - Keystone

Browse Source 
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.

Change-Id: Ie3d0ce1bb72bad5b5eb6c0189fb6bcb757e6ed36
Partially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-27 09:33:39 +00:00
parent eecf6581a4
commit 42eebad553
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker_templates/keystone/Dockerfile.j2
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 %}