diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 09:42:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 09:42:43 +0000 |
| commit | 5b482b68c289948a747a21b6a1510990bf337990 (patch) | |
| tree | 62187c7b7c8e7a4efe44382cce3966abb383e94f /docker/keystone | |
| parent | 385658b77662a06ae7b0eb7320897be13065cbd0 (diff) | |
| parent | 39aba34b2a884887cab117ff233469051cc2ec22 (diff) | |
| download | kolla-5b482b68c289948a747a21b6a1510990bf337990.tar.gz kolla-5b482b68c289948a747a21b6a1510990bf337990.zip | |
Merge "Remove all fail sections for Ubuntu"
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 7d2aea70e..067f16b89 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -15,20 +15,6 @@ 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', 'debian'] %} - -RUN apt-get install -y --no-install-recommends \ - apache2 \ - keystone \ - libapache2-mod-wsgi \ - python-keystoneclient \ - && apt-get clean - -RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled \ - && 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 - {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} |