From f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 19:23:49 -0700
Subject: Remove docker directory

Remove the docker directory (yay) and old build tools.

This will result in an f21 failing gate - however, I have a patch
submission to remove that gate from our project configuration.

Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33
Partially-Implements: blueprint remove-docker-dir
---
 docker/centos/binary/keystone/Dockerfile         | 25 ------------------------
 docker/centos/binary/keystone/build              |  1 -
 docker/centos/binary/keystone/config-external.sh |  1 -
 docker/centos/binary/keystone/start.sh           |  1 -
 4 files changed, 28 deletions(-)
 delete mode 100644 docker/centos/binary/keystone/Dockerfile
 delete mode 120000 docker/centos/binary/keystone/build
 delete mode 120000 docker/centos/binary/keystone/config-external.sh
 delete mode 120000 docker/centos/binary/keystone/start.sh

(limited to 'docker/centos/binary/keystone')

diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile
deleted file mode 100644
index 11cef4d8f..000000000
--- a/docker/centos/binary/keystone/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-keystone \
-        python-keystoneclient \
-        python-openstackclient \
-        httpd \
-        mod_wsgi \
-        && yum clean all
-
-RUN mkdir -p /var/www/cgi-bin/keystone /var/log/keystone
-RUN cp -a /usr/share/keystone/wsgi-keystone.conf /etc/httpd/conf.d
-RUN sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf
-RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
-RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main
-RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin
-RUN chown -R keystone: /var/www/cgi-bin/keystone
-RUN chmod 755 /var/www/cgi-bin/keystone/*
-
-# Add start-up and check scripts
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-# Run the Keystone start script
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/keystone/build b/docker/centos/binary/keystone/build
deleted file mode 120000
index 8d652f7ee..000000000
--- a/docker/centos/binary/keystone/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/keystone/config-external.sh b/docker/centos/binary/keystone/config-external.sh
deleted file mode 120000
index ae5be7eea..000000000
--- a/docker/centos/binary/keystone/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/keystone/start.sh b/docker/centos/binary/keystone/start.sh
deleted file mode 120000
index ae34844ea..000000000
--- a/docker/centos/binary/keystone/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/keystone/start.sh
\ No newline at end of file
-- 
cgit v1.2.3