openstack/kolla-ansible
Code Issues Proposed changes

Remove barbican

Browse Source 
Barbican has never worked properly

Change-Id: Ifd0b74adf5afea321508376ad46ac3ddef0b5b89
Closes-Bug: #1486249
This commit is contained in:
Sam Yaple 2015-08-19 05:25:45 +00:00
parent 718db54fa8
commit 102c8332bd
16 changed files with 1 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.ini
View File

@ -1,13 +1,3 @@
[barbican]
type = url
location = http://tarballs.openstack.org/barbican/barbican-master.tar.gz
dest_filename = barbican.tar
[barbican-base]
type = url
location = http://tarballs.openstack.org/barbican/barbican-master.tar.gz
dest_filename = barbican.tar
[ceilometer-base]
type = url
location = http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz

40
docker/centos/binary/barbican/Dockerfile
View File

@ -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"]

1
docker/centos/binary/barbican/build
View File

@ -1 +0,0 @@
../../../../tools/build-docker-image

1
docker/centos/binary/barbican/config-external.sh
View File

@ -1 +0,0 @@
../../../common/barbican/config-external.sh

1
docker/centos/binary/barbican/start.sh
View File

@ -1 +0,0 @@
../../../common/barbican/start.sh

10
docker/centos/source/barbican/.buildinfo
View File

@ -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}

19
docker/centos/source/barbican/Dockerfile
View File

@ -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"]

1
docker/centos/source/barbican/build
View File

@ -1 +0,0 @@
../../../../tools/build-docker-image

1
docker/centos/source/barbican/config-external.sh
View File

@ -1 +0,0 @@
../../../common/barbican/config-external.sh

1
docker/centos/source/barbican/start.sh
View File

@ -1 +0,0 @@
../../../common/barbican/start.sh

10
docker/common/barbican/config-external.sh
View File

@ -1,10 +0,0 @@
#!/bin/bash
SOURCE="/opt/kolla/barbican/barbican.conf"
TARGET="/etc/barbican/barbican.conf"
OWNER="barbican"
if [[ -f "$SOURCE" ]]; then
cp $SOURCE $TARGET
chown ${OWNER}: $TARGET
chmod 0644 $TARGET
fi

22
docker/common/barbican/start.sh
View File

@ -1,22 +0,0 @@
#!/bin/bash
set -o errexit
CMD="uwsgi"
ARGS="--master --emperor"
# Loading common functions.
source /opt/kolla/kolla-common.sh
# Execute config strategy
set_configs
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
su -s /bin/sh -c "barbican-manage db_sync" barbican
exit 0
fi
exec $CMD $ARGS

1
docker/fedora/binary/barbican
View File

@ -1 +0,0 @@
../../centos/binary/barbican

1
docker/rhel/binary/barbican
View File

@ -1 +0,0 @@
../../centos/binary/barbican

3
tests/test_build.py
View File

@ -38,8 +38,7 @@ class BuildTest(base.BaseTestCase):
bad_results, good_results = build.main()
# these are images that are known to not build properly
excluded_images = ["barbican",
"gnocchi-api",
excluded_images = ["gnocchi-api",
"gnocchi-statsd"]
failures = 0

1
tests/test_images.py
View File

@ -40,7 +40,6 @@ class ImagesTest(base.BaseTestCase):
# these are images that are known to not build properly
excluded_images = ["kollaglue/centos-rdo-rhel-osp-base",
"kollaglue/centos-rdo-barbican",
"kollaglue/centos-rdo-gnocchi-api",
"kollaglue/centos-rdo-gnocchi-statsd"]