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/binary/barbican/Dockerfile | 40 ------------------------ docker/centos/binary/barbican/build | 1 - docker/centos/binary/barbican/config-external.sh | 1 - docker/centos/binary/barbican/start.sh | 1 - 4 files changed, 43 deletions(-) delete mode 100644 docker/centos/binary/barbican/Dockerfile delete mode 120000 docker/centos/binary/barbican/build delete mode 120000 docker/centos/binary/barbican/config-external.sh delete mode 120000 docker/centos/binary/barbican/start.sh (limited to 'docker/centos/binary') diff --git a/docker/centos/binary/barbican/Dockerfile b/docker/centos/binary/barbican/Dockerfile deleted file mode 100644 index 5c139a0ad..000000000 --- a/docker/centos/binary/barbican/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh - -# Install required packages -# NOTE: these packages (tar especially) can be pruned once converted to -# installation via RPM: https://bugs.launchpad.net/kolla/+bug/1453926 -RUN yum install -y gcc Cython sqlite-devel mysql-devel libffi-devel tar && yum clean all - -# use the Barbican Juno version -# setting this as environment variable also keeps pbr version checking happy -# TODO: when the Barbican rpm from cloudkeep.io is usable, -# switch to using that instead -ENV PBR_VERSION 2014.2 - -# Get and extract the Barbican tar ball -RUN curl -o /barbican-$PBR_VERSION.tar.gz https://github.com/openstack/barbican/archive/$PBR_VERSION.tar.gz -L -RUN tar -xzf barbican-$PBR_VERSION.tar.gz - -# Install Barbican requirements -RUN pip install -r barbican-$PBR_VERSION/requirements.txt -RUN pip install MySQL-python - -# Install Barbican -RUN cd barbican-$PBR_VERSION && python setup.py install - -# Configure Barbican -RUN mkdir -p /etc/barbican -RUN mkdir -p /var/log/barbican -RUN cp -r /barbican-$PBR_VERSION/etc/barbican/* /etc/barbican - -# Instal uwsgi as that is what we will use to run Barbican -RUN pip install uwsgi - -# Cleanup files not required anymore -RUN rm -rf /barbican-$PBR_VERSION -RUN rm -rf /barbican-$PBR_VERSION.tar.gz - -CMD ["/start.sh"] diff --git a/docker/centos/binary/barbican/build b/docker/centos/binary/barbican/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/barbican/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/barbican/config-external.sh b/docker/centos/binary/barbican/config-external.sh deleted file mode 120000 index 5a0d7a06c..000000000 --- a/docker/centos/binary/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/binary/barbican/start.sh b/docker/centos/binary/barbican/start.sh deleted file mode 120000 index fbb47be02..000000000 --- a/docker/centos/binary/barbican/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/start.sh \ No newline at end of file -- cgit v1.2.3