diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-23 07:42:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-23 07:42:15 +0000 |
| commit | 5801e969e1b7dba20644783abaaa5adb7cef4d0d (patch) | |
| tree | d8500d94b5a8580623ad0e43c37c7476b2c4ab62 /docker_templates | |
| parent | aae4016908c06c4fbc60773818b81c21c8b15bde (diff) | |
| parent | 17333aed12775a439dc8d0699bf1811d7160ac55 (diff) | |
| download | kolla-5801e969e1b7dba20644783abaaa5adb7cef4d0d.tar.gz kolla-5801e969e1b7dba20644783abaaa5adb7cef4d0d.zip | |
Merge "Fix keystone for Ubuntu"
Diffstat (limited to 'docker_templates')
| -rw-r--r-- | docker_templates/keystone/Dockerfile.j2 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker_templates/keystone/Dockerfile.j2 b/docker_templates/keystone/Dockerfile.j2 index f3b7e0e9f..3a69691fa 100644 --- a/docker_templates/keystone/Dockerfile.j2 +++ b/docker_templates/keystone/Dockerfile.j2 @@ -42,7 +42,6 @@ RUN yum -y install \ RUN apt-get install -y --no-install-recommends \ apache2 \ - keystone \ libapache2-mod-wsgi \ && apt-get clean @@ -54,8 +53,8 @@ RUN ln -s /keystone-* /keystone RUN cd /keystone \ && useradd --user-group keystone \ && pip install -r requirements.txt \ - && pip install /keystone \ - && mkdir /etc/keystone /var/www/cgi-bin/keystone \ + && pip install --install-option="--install-scripts=/usr/bin" /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 |