diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-20 14:49:49 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-23 06:07:04 +0000 |
| commit | 17333aed12775a439dc8d0699bf1811d7160ac55 (patch) | |
| tree | 1c24f2748bdcbd66173ed73eeeb9df4c50e0a9ef /docker_templates | |
| parent | 5dcf175cb5e8220ca679210b4ebd0d6a4124d4a3 (diff) | |
| download | kolla-17333aed12775a439dc8d0699bf1811d7160ac55.tar.gz kolla-17333aed12775a439dc8d0699bf1811d7160ac55.zip | |
Fix keystone for Ubuntu
Due to the differences between Ubuntu and Centos around Apache2 I have
had to copy both start.sh and config-external.sh to be unique files
for Ubuntu so as not to affect Centos either. This can be removed when
we change the way config-external works.
Change-Id: I14dc11e7bb6284b897259a53acc914ae8f254d3c
Partially-Implements: blueprint install-from-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 |