x
/
fuel-ccp-keystone
Code Issues Proposed changes

Merge "Remove usage of deprecated httpd/keystone.py"

This commit is contained in:
Jenkins 2016-09-26 17:26:21 +00:00 committed by Gerrit Code Review
parent 58923d1656 5af7b01622
commit feffc5cd61
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/keystone/Dockerfile.j2
View File

@ -16,13 +16,10 @@ RUN useradd --user-group keystone \
&& /var/lib/microservices/venv/bin/pip --no-cache-dir install --upgrade -c /keystone/requirements.txt /keystone \
&& mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \
&& cp -r /keystone/etc/* /etc/keystone/ \
&& cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/admin \
&& cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/main \
&& cp /var/lib/microservices/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& cp /var/lib/microservices/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/public \
&& chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone
RUN chown -R keystone: /var/www/cgi-bin/keystone \
&& chmod 755 /var/www/cgi-bin/keystone/*
COPY daemon.sh /usr/local/bin/daemon.sh
COPY keystone_sudoers /etc/sudoers.d/keystone_sudoers
RUN chmod 755 /usr/local/bin/daemon.sh \

2
service/files/wsgi-keystone.conf.j2
View File

@ -5,7 +5,7 @@ Listen {{ keystone_admin_port }}
<VirtualHost *:{{ keystone_public_port }}>
WSGIDaemonProcess keystone-public processes={{ keystone_wsgi_processes }} threads={{ keystone_wsgi_threads }} user=keystone group=keystone display-name=%{GROUP} python-path={{ venv_path }}
WSGIProcessGroup keystone-public
WSGIScriptAlias / /var/www/cgi-bin/keystone/main
WSGIScriptAlias / /var/www/cgi-bin/keystone/public
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
ErrorLogFormat "%M"