From 102c8332bd1d19aaa07cf5d8103206f1aff7eee2 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Wed, 19 Aug 2015 05:25:45 +0000 Subject: Remove barbican Barbican has never worked properly Change-Id: Ifd0b74adf5afea321508376ad46ac3ddef0b5b89 Closes-Bug: #1486249 --- docker/centos/source/barbican/.buildinfo | 10 ---------- docker/centos/source/barbican/Dockerfile | 19 ------------------- docker/centos/source/barbican/build | 1 - docker/centos/source/barbican/config-external.sh | 1 - docker/centos/source/barbican/start.sh | 1 - 5 files changed, 32 deletions(-) delete mode 100644 docker/centos/source/barbican/.buildinfo delete mode 100644 docker/centos/source/barbican/Dockerfile delete mode 120000 docker/centos/source/barbican/build delete mode 120000 docker/centos/source/barbican/config-external.sh delete mode 120000 docker/centos/source/barbican/start.sh (limited to 'docker/centos/source') diff --git a/docker/centos/source/barbican/.buildinfo b/docker/centos/source/barbican/.buildinfo deleted file mode 100644 index 3ac7ec7fe..000000000 --- a/docker/centos/source/barbican/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=barbican -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/barbican} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/barbican/barbican-master.tar.gz} diff --git a/docker/centos/source/barbican/Dockerfile b/docker/centos/source/barbican/Dockerfile deleted file mode 100644 index 23469321a..000000000 --- a/docker/centos/source/barbican/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./barbican.tar / -RUN ln -s /barbican-* /barbican - -RUN cd /barbican \ - && useradd --user-group barbican \ - && pip install uwsgi \ - && pip install -r requirements.txt \ - && pip install /barbican \ - && mkdir /etc/barbican /var/log/barbican \ - && cp -r /barbican/etc/* /etc/barbican/ \ - && rm -rf /root/.cache - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/barbican/build b/docker/centos/source/barbican/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/barbican/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/source/barbican/config-external.sh b/docker/centos/source/barbican/config-external.sh deleted file mode 120000 index 5a0d7a06c..000000000 --- a/docker/centos/source/barbican/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/config-external.sh \ No newline at end of file diff --git a/docker/centos/source/barbican/start.sh b/docker/centos/source/barbican/start.sh deleted file mode 120000 index fbb47be02..000000000 --- a/docker/centos/source/barbican/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/start.sh \ No newline at end of file -- cgit v1.2.3