openstack/barbican
Code Issues Proposed changes

Enable installation of barbican_tempest_plugin

Browse Source 
In case tempest is enabled we need to install the barbican tempest
repo and register the plugin endpoint.

Change-Id: I376d58cad9a33dc90afdd0bf01e1e73bdd5a8b28
Depends-On: I7a861dcc800cf3a49da2e317e4780aa5c5027733
This commit is contained in:
Marc Koderer 2016-12-02 14:51:47 +01:00
parent eb8187b572
commit 8706feb6e7
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devstack/plugin.sh
View File

@ -1,3 +1,13 @@
# Configure the needed tempest options
function configure_barbican_tempest() {
iniset $TEMPEST_CONFIG service_available barbican True
}
function install_barbicantempest {
git_clone_by_name "barbican-tempest-plugin"
setup_dev_lib "barbican-tempest-plugin"
}
# check for service enabled # check for service enabled
if is_service_enabled barbican; then if is_service_enabled barbican; then
if [[ "$1" == "source" || "`type -t install_barbican`" != 'function' ]]; then if [[ "$1" == "source" || "`type -t install_barbican`" != 'function' ]]; then
@ -9,6 +19,9 @@ if is_service_enabled barbican; then
echo_summary "Installing Barbican" echo_summary "Installing Barbican"
install_barbican install_barbican
install_barbicanclient install_barbicanclient
if is_service_enabled tempest; then
install_barbicantempest
fi
if is_service_enabled barbican-pykmip; then if is_service_enabled barbican-pykmip; then
echo_summary "Installing PyKMIP" echo_summary "Installing PyKMIP"
install_pykmip install_pykmip
@ -39,6 +52,10 @@ if is_service_enabled barbican; then
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Initializing Barbican" echo_summary "Initializing Barbican"
init_barbican init_barbican
if is_service_enabled tempest; then
echo_summary "Configuring Tempest options for Barbican"
configure_barbican_tempest
fi
start_barbican start_barbican
if is_service_enabled pykmip-server; then if is_service_enabled pykmip-server; then
echo_summary "Starting PyKMIP server" echo_summary "Starting PyKMIP server"

4
devstack/settings
View File

@ -31,4 +31,8 @@ BARBICAN_HOST_HREF=${BARBICAN_HOST_HREF:-http://${SERVICE_HOST}:9311}
# Tell Tempest this project is present # Tell Tempest this project is present
TEMPEST_SERVICES+=,barbican TEMPEST_SERVICES+=,barbican
GITREPO["barbican-tempest-plugin"]=${BARBICANTEMPEST_REPO:-${GIT_BASE}/openstack/barbican-tempest-plugin.git}
GITBRANCH["barbican-tempest-plugin"]=${BARBICANTEMPEST_BRANCH:-master}
GITDIR["barbican-tempest-plugin"]=$DEST/barbican-tempest-plugin
enable_service barbican enable_service barbican