From 102c8332bd1d19aaa07cf5d8103206f1aff7eee2 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 19 Aug 2015 05:25:45 +0000
Subject: Remove barbican

Barbican has never worked properly

Change-Id: Ifd0b74adf5afea321508376ad46ac3ddef0b5b89
Closes-Bug: #1486249
---
 docker/common/barbican/config-external.sh | 10 ----------
 docker/common/barbican/start.sh           | 22 ----------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 docker/common/barbican/config-external.sh
 delete mode 100755 docker/common/barbican/start.sh

(limited to 'docker/common')

diff --git a/docker/common/barbican/config-external.sh b/docker/common/barbican/config-external.sh
deleted file mode 100644
index 12ca52fb9..000000000
--- 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 589773540..000000000
--- 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
-
-- 
cgit v1.2.3