diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:23:49 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch) | |
| tree | cc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/centos/source/keystone | |
| parent | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff) | |
| download | kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip | |
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
Diffstat (limited to 'docker/centos/source/keystone')
| -rw-r--r-- | docker/centos/source/keystone/.buildinfo | 10 | ||||
| -rw-r--r-- | docker/centos/source/keystone/Dockerfile | 30 | ||||
| l--------- | docker/centos/source/keystone/build | 1 | ||||
| l--------- | docker/centos/source/keystone/config-external.sh | 1 | ||||
| l--------- | docker/centos/source/keystone/start.sh | 1 |
5 files changed, 0 insertions, 43 deletions
diff --git a/docker/centos/source/keystone/.buildinfo b/docker/centos/source/keystone/.buildinfo deleted file mode 100644 index b1ce82439..000000000 --- a/docker/centos/source/keystone/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=keystone -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/keystone} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/keystone/keystone-master.tar.gz} diff --git a/docker/centos/source/keystone/Dockerfile b/docker/centos/source/keystone/Dockerfile deleted file mode 100644 index f83321591..000000000 --- a/docker/centos/source/keystone/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - httpd \ - mod_wsgi \ - && yum clean all - -ADD ./keystone.tar / -RUN ln -s /keystone-* /keystone - -RUN cd /keystone \ - && useradd --user-group keystone \ - && pip install -r requirements.txt \ - && pip install /keystone \ - && mkdir /etc/keystone /var/log/keystone /var/www/cgi-bin/keystone \ - && cp /keystone/etc/keystone.conf.sample /etc/keystone/keystone.conf \ - && cp -r /keystone/etc/* /etc/keystone/ \ - && cp -a httpd/wsgi-keystone.conf /etc/httpd/conf.d \ - && sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf \ - && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/main \ - && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/admin \ - && chown -R keystone: /var/www/cgi-bin/keystone /var/log/keystone \ - && chmod 755 /var/www/cgi-bin/keystone/* - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/keystone/build b/docker/centos/source/keystone/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/keystone/config-external.sh b/docker/centos/source/keystone/config-external.sh deleted file mode 120000 index ae5be7eea..000000000 --- a/docker/centos/source/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/source/keystone/start.sh b/docker/centos/source/keystone/start.sh deleted file mode 120000 index ae34844ea..000000000 --- a/docker/centos/source/keystone/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/start.sh
\ No newline at end of file |
