diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-30 08:37:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-30 08:37:02 +0000 |
| commit | 44987794dee5b6b909e2f41ad20e271fb4b6b670 (patch) | |
| tree | ed0e7727828ef60d350e56f7f89845968b17b611 /docker | |
| parent | 64ca1ce5d94dbb14b2aee2962e02679ba198a951 (diff) | |
| parent | b4d692fae2cbfa2355cb8db4aab9f6b75c7421c5 (diff) | |
| download | kolla-44987794dee5b6b909e2f41ad20e271fb4b6b670.tar.gz kolla-44987794dee5b6b909e2f41ad20e271fb4b6b670.zip | |
Merge "Keystone ubuntu binary container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 9754bd425..9d1fe298c 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -15,6 +15,19 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ && cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \ && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + keystone \ + apache2 \ + libapache2-mod-wsgi \ + && apt-get clean + +RUN mkdir -p /var/www/cgi-bin/keystone \ + && cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \ + && cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \ + && echo > /etc/apache2/ports.conf + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} |