openstack/devstack
Code Issues Proposed changes

Always have ./clean.sh run ./unstack.sh

Browse Source 
There was detection code in clean.sh to only run it if a screen
session was found, but in systemd world, that's obviously not
true. This was causing me (and others) substantial confusion.

Change-Id: I204e94cd86b8c67012aabfca74796e593151c3a4
This commit is contained in:
Sean Dague 2017-05-04 16:05:19 -04:00
parent b2bfe5617a
commit eaadffe07b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clean.sh
View File

@ -64,13 +64,8 @@ if [[ -d $TOP_DIR/extras.d ]]; then
done done
fi fi
# See if there is anything running... # Let unstack.sh do its thing first
# need to adapt when run_service is merged $TOP_DIR/unstack.sh --all
SESSION=$(screen -ls | awk '/[0-9].stack/ { print $1 }')
if [[ -n "$SESSION" ]]; then
# Let unstack.sh do its thing first
$TOP_DIR/unstack.sh --all
fi
# Run extras # Run extras
# ========== # ==========