openstack
/
monasca-api
Code Issues Proposed changes

Remove unnecessary condition 

Use variables from Vagrant file for local deployement.
Use variables for gate from settings file.

Change-Id: Ibd1dc622d4d095c1899c06c61e7aa7b1db084aaf
This commit is contained in:
Artur Basiak 2016-10-20 06:46:23 +02:00
parent 62f2380731
commit e60b636ac9
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/Vagrantfile vendored
View File

@ -93,6 +93,8 @@ LOGFILE=$DEST/logs/stack.sh.log
LOGDIR=$DEST/logs
LOG_COLOR=False
DEST=/opt/stack
disable_all_services
enable_service rabbit mysql key tempest horizon

13
devstack/plugin.sh
View File

@ -56,19 +56,6 @@ if [ -n "$MYSQL_PASSWORD" ]; then
DATABASE_PASSWORD=$MYSQL_PASSWORD
fi
# Determine if we are running in devstack-gate or devstack.
if [[ $DEST ]]; then
# We are running in devstack-gate.
export MONASCA_BASE=${MONASCA_BASE:-"${DEST}"}
else
# We are running in devstack.
export MONASCA_BASE=${MONASCA_BASE:-"/opt/stack"}
fi
# db users
MON_DB_USERS=("notification" "monapi" "thresh")
MON_DB_HOSTS=("%" "localhost" "$MYSQL_HOST")