diff --git a/build.ini b/build.ini index 23327a5f99..0330fc00e5 100644 --- a/build.ini +++ b/build.ini @@ -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 diff --git a/docker/centos/binary/barbican/Dockerfile b/docker/centos/binary/barbican/Dockerfile deleted file mode 100644 index 5c139a0add..0000000000 --- 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 8d652f7ee2..0000000000 --- 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 5a0d7a06c8..0000000000 --- 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 fbb47be02d..0000000000 --- a/docker/centos/binary/barbican/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/start.sh \ No newline at end of file diff --git a/docker/centos/source/barbican/.buildinfo b/docker/centos/source/barbican/.buildinfo deleted file mode 100644 index 3ac7ec7fe6..0000000000 --- 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 23469321a0..0000000000 --- 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 8d652f7ee2..0000000000 --- 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 5a0d7a06c8..0000000000 --- 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 fbb47be02d..0000000000 --- a/docker/centos/source/barbican/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/start.sh \ No newline at end of file diff --git a/docker/common/barbican/config-external.sh b/docker/common/barbican/config-external.sh deleted file mode 100644 index 12ca52fb91..0000000000 --- a/docker/common/barbican/config-external.sh +++ /dev/null @@ -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 diff --git a/docker/common/barbican/start.sh b/docker/common/barbican/start.sh deleted file mode 100755 index 589773540e..0000000000 --- a/docker/common/barbican/start.sh +++ /dev/null @@ -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 - diff --git a/docker/fedora/binary/barbican b/docker/fedora/binary/barbican deleted file mode 120000 index 7dd5c24cef..0000000000 --- a/docker/fedora/binary/barbican +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/barbican \ No newline at end of file diff --git a/docker/rhel/binary/barbican b/docker/rhel/binary/barbican deleted file mode 120000 index 7dd5c24cef..0000000000 --- a/docker/rhel/binary/barbican +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/barbican \ No newline at end of file diff --git a/tests/test_build.py b/tests/test_build.py index 03a15e6c4d..3b1f6c757e 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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 diff --git a/tests/test_images.py b/tests/test_images.py index 9c0ceefadf..d0a7007928 100644 --- a/tests/test_images.py +++ b/tests/test_images.py @@ -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"]