diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-19 16:01:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-19 16:01:28 +0000 |
| commit | ddec57673b4c38476bb51f077d8b96d602f3990c (patch) | |
| tree | 08acaa820746b8961b9260626edba9a47797eaf1 /docker/common | |
| parent | b214523d58d83f672a15fad6faf2739137e43853 (diff) | |
| parent | 102c8332bd1d19aaa07cf5d8103206f1aff7eee2 (diff) | |
| download | kolla-ddec57673b4c38476bb51f077d8b96d602f3990c.tar.gz kolla-ddec57673b4c38476bb51f077d8b96d602f3990c.zip | |
Merge "Remove barbican"
Diffstat (limited to 'docker/common')
| -rw-r--r-- | docker/common/barbican/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/barbican/start.sh | 22 |
2 files changed, 0 insertions, 32 deletions
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 - |