openstack
/
barbican
Code Issues Proposed changes

Minor changes to make the bash8 check happy 

Change-Id: Ic3fd85ce066cd9b15fec95316afe38974e8f19cb
This commit is contained in:
Chad Lung 2014-03-05 17:16:18 -06:00
parent 45795fadbb
commit 53af996600
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/devstack/extras.d/70-barbican.sh
View File

@ -27,4 +27,4 @@ if is_service_enabled barbican; then
if [[ "$1" == "unstack" ]]; then if [[ "$1" == "unstack" ]]; then
stop_barbican stop_barbican
fi fi
fi fi

34
contrib/devstack/lib/barbican
View File

@ -55,19 +55,19 @@ TEMPEST_SERVICES+=,barbican
# Functions # Functions
# --------- # ---------
# cleanup_barbican() - Remove residual data files, anything left over from previous # cleanup_barbican - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up # runs that a clean run would need to clean up
function cleanup_barbican() { function cleanup_barbican {
: :
} }
# configure_barbicanclient() - Set config files, create data dirs, etc # configure_barbicanclient - Set config files, create data dirs, etc
function configure_barbicanclient() { function configure_barbicanclient {
setup_develop $BARBICANCLIENT_DIR setup_develop $BARBICANCLIENT_DIR
} }
# configure_barbican() - Set config files, create data dirs, etc # configure_barbican - Set config files, create data dirs, etc
function configure_barbican() { function configure_barbican {
setup_develop $BARBICAN_DIR setup_develop $BARBICAN_DIR
[ ! -d $BARBICAN_CONF_DIR ] && sudo mkdir -m 755 -p $BARBICAN_CONF_DIR [ ! -d $BARBICAN_CONF_DIR ] && sudo mkdir -m 755 -p $BARBICAN_CONF_DIR
@ -123,8 +123,8 @@ function configure_barbican() {
iniset $BARBICAN_PASTE_CONF 'filter:keystone_authtoken' signing_dir $BARBICAN_AUTH_CACHE_DIR iniset $BARBICAN_PASTE_CONF 'filter:keystone_authtoken' signing_dir $BARBICAN_AUTH_CACHE_DIR
} }
# init_barbican() - Initialize etc. # init_barbican - Initialize etc.
function init_barbican() { function init_barbican {
# Create cache dir # Create cache dir
sudo mkdir -p $BARBICAN_AUTH_CACHE_DIR sudo mkdir -p $BARBICAN_AUTH_CACHE_DIR
sudo chown $STACK_USER $BARBICAN_AUTH_CACHE_DIR sudo chown $STACK_USER $BARBICAN_AUTH_CACHE_DIR
@ -133,30 +133,30 @@ function init_barbican() {
recreate_database barbican utf8 recreate_database barbican utf8
} }
# install_barbican() - Collect source and prepare # install_barbican - Collect source and prepare
function install_barbican() { function install_barbican {
git_clone $BARBICAN_REPO $BARBICAN_DIR $BARBICAN_BRANCH git_clone $BARBICAN_REPO $BARBICAN_DIR $BARBICAN_BRANCH
setup_develop $BARBICAN_DIR setup_develop $BARBICAN_DIR
pip_install 'uwsgi' pip_install 'uwsgi'
} }
# install_barbicanclient() - Collect source and prepare # install_barbicanclient - Collect source and prepare
function install_barbicanclient() { function install_barbicanclient {
git_clone $BARBICANCLIENT_REPO $BARBICANCLIENT_DIR $BARBICANCLIENT_BRANCH git_clone $BARBICANCLIENT_REPO $BARBICANCLIENT_DIR $BARBICANCLIENT_BRANCH
setup_develop $BARBICANCLIENT_DIR setup_develop $BARBICANCLIENT_DIR
} }
# start_barbican() - Start running processes, including screen # start_barbican - Start running processes, including screen
function start_barbican() { function start_barbican {
screen_it barbican "uwsgi --master --emperor $BARBICAN_CONF_DIR/vassals --logto $BARBICAN_API_LOG_DIR/api.log" screen_it barbican "uwsgi --master --emperor $BARBICAN_CONF_DIR/vassals --logto $BARBICAN_API_LOG_DIR/api.log"
} }
# stop_barbican() - Stop running processes # stop_barbican - Stop running processes
function stop_barbican() { function stop_barbican {
screen_stop barbican screen_stop barbican
} }
function create_barbican_accounts() { function create_barbican_accounts {
SERVICE_TENANT=$(keystone tenant-list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") SERVICE_TENANT=$(keystone tenant-list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
ADMIN_ROLE=$(keystone role-list | awk "/ admin / { print \$2 }") ADMIN_ROLE=$(keystone role-list | awk "/ admin / { print \$2 }")