openstack/deb-murano
Code Issues Proposed changes

Merge "Add cleanup method in devstack scripts"

Browse Source
This commit is contained in:
Jenkins 2014-08-20 09:43:10 +00:00 committed by Gerrit Code Review
commit 46607958c2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/devstack/extras.d/70-murano.sh
View File

@ -31,5 +31,6 @@ if is_service_enabled murano; then
if [[ "$1" == "unstack" ]]; then
stop_murano
cleanup_murano
fi
fi

9
contrib/devstack/lib/murano
View File

@ -41,6 +41,8 @@ MURANO_SERVICE_PROTOCOL=${MURANO_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
MURANO_ADMIN_USER=${MURANO_ADMIN_USER:-murano}
MURANO_KEYSTONE_SIGNING_DIR=${MURANO_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing-muranoapi}
# MURANO_RABBIT_VHOST allows to specify a separate virtual host for Murano services.
# This is not required if all OpenStack services are deployed by devstack scripts
# on a single node. In this case '/' virtual host (which is the default) is enough.
@ -137,6 +139,8 @@ function configure_murano {
cp $MURANO_DIR/etc/murano/murano-paste.ini $MURANO_CONF_DIR
cp $MURANO_DIR/etc/murano/policy.json $MURANO_POLICY_FILE
cleanup_murano
iniset $MURANO_CONF_FILE DEFAULT debug $MURANO_DEBUG
iniset $MURANO_CONF_FILE DEFAULT use_syslog $SYSLOG
@ -212,6 +216,11 @@ function stop_murano() {
screen -S $SCREEN_NAME -p murano-engine -X kill
}
function cleanup_murano() {
# Cleanup keystone signing dir
sudo rm -rf $MURANO_KEYSTONE_SIGNING_DIR
}
# Restore xtrace
$XTRACE