Merge "Add Keystone image for Ubuntu"

docker/ubuntu/binary/base/Dockerfile

@@ -9,6 +9,7 @@ RUN apt-get update \
     && apt-get dist-upgrade -y \
     && apt-get install -y --no-install-recommends \
         crudini \
+        curl \
         openssl \
     && apt-get clean
 

docker/ubuntu/binary/keystone/Dockerfile

@@ -0,0 +1,22 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN apt-get install -y --no-install-recommends \
+        apache2 \
+        keystone \
+        libapache2-mod-wsgi \
+        python-keystoneclient \
+    && apt-get clean
+
+RUN curl -o /etc/apache2/sites-available/wsgi-keystone.conf \
+    https://raw.githubusercontent.com/openstack/keystone/stable/kilo/httpd/wsgi-keystone.conf
+RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled
+RUN mkdir -p /var/www/cgi-bin/keystone
+RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main
+RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin
+RUN chown -R keystone:keystone /var/www/cgi-bin/keystone
+RUN chmod 755 /var/www/cgi-bin/keystone/*
+
+COPY start.sh check.sh /
+
+CMD ["/start.sh"]

docker/ubuntu/binary/keystone/build

@@ -0,0 +1 @@
+../../../../tools/build-docker-image

docker/ubuntu/binary/keystone/check.sh

@@ -0,0 +1 @@
+../../../common/keystone/check.sh

docker/ubuntu/binary/keystone/start.sh

@@ -0,0 +1 @@
+../../../common/keystone/start.sh