From 0ffd2deaa23f1b65a4940f98bf2101308921d748 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal.rostecki@allegrogroup.com>
Date: Sun, 28 Jun 2015 09:09:07 +0200
Subject: [PATCH] Add Keystone image for Ubuntu

Dockerfile for Keystone service installed from Ubuntu
Cloud Archive.

Partially implements: blueprint install-from-ubuntu
Depends-On: I66bf97b508b740f8db49ed6217c6fefe5de1637e

Change-Id: Ia269ebee75c99a5b39b73237a78fdf1cc9514548
---
 docker/ubuntu/binary/base/Dockerfile     |  1 +
 docker/ubuntu/binary/keystone/Dockerfile | 22 ++++++++++++++++++++++
 docker/ubuntu/binary/keystone/build      |  1 +
 docker/ubuntu/binary/keystone/check.sh   |  1 +
 docker/ubuntu/binary/keystone/start.sh   |  1 +
 5 files changed, 26 insertions(+)
 create mode 100644 docker/ubuntu/binary/keystone/Dockerfile
 create mode 120000 docker/ubuntu/binary/keystone/build
 create mode 120000 docker/ubuntu/binary/keystone/check.sh
 create mode 120000 docker/ubuntu/binary/keystone/start.sh

diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile
index c48c3e32b2..e5e0f52424 100644
--- a/docker/ubuntu/binary/base/Dockerfile
+++ b/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
 
diff --git a/docker/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile
new file mode 100644
index 0000000000..af362252d2
--- /dev/null
+++ b/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"]
diff --git a/docker/ubuntu/binary/keystone/build b/docker/ubuntu/binary/keystone/build
new file mode 120000
index 0000000000..8d652f7ee2
--- /dev/null
+++ b/docker/ubuntu/binary/keystone/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/ubuntu/binary/keystone/check.sh b/docker/ubuntu/binary/keystone/check.sh
new file mode 120000
index 0000000000..fe8e7608c0
--- /dev/null
+++ b/docker/ubuntu/binary/keystone/check.sh
@@ -0,0 +1 @@
+../../../common/keystone/check.sh
\ No newline at end of file
diff --git a/docker/ubuntu/binary/keystone/start.sh b/docker/ubuntu/binary/keystone/start.sh
new file mode 120000
index 0000000000..ae34844eab
--- /dev/null
+++ b/docker/ubuntu/binary/keystone/start.sh
@@ -0,0 +1 @@
+../../../common/keystone/start.sh
\ No newline at end of file