openstack/devstack
Code Issues Proposed changes

Merge "remove clouds.yaml in clean.sh"

Browse Source
This commit is contained in:
Jenkins 2016-04-21 20:01:54 +00:00 committed by Gerrit Code Review
commit 54f331969f
2 changed files with 4 additions and 3 deletions

5
clean.sh

@ -137,9 +137,10 @@ rm -rf $DIRS_TO_CLEAN
FILES_TO_CLEAN=".localrc.auto .localrc.password " FILES_TO_CLEAN=".localrc.auto .localrc.password "
FILES_TO_CLEAN+="docs/files docs/html shocco/ " FILES_TO_CLEAN+="docs/files docs/html shocco/ "
FILES_TO_CLEAN+="stack-screenrc test*.conf* test.ini* " FILES_TO_CLEAN+="stack-screenrc test*.conf* test.ini* "
FILES_TO_CLEAN+=".stackenv .prereqs " FILES_TO_CLEAN+=".stackenv .prereqs"
FILES_TO_CLEAN+="~/.config/openstack"
for file in $FILES_TO_CLEAN; do for file in $FILES_TO_CLEAN; do
rm -rf $TOP_DIR/$file rm -rf $TOP_DIR/$file
done done
rm -rf ~/.config/openstack

2
functions-common

@ -123,7 +123,7 @@ function write_clouds_yaml {
--os-project-name admin --os-project-name admin
# CLean up any old clouds.yaml files we had laying around # CLean up any old clouds.yaml files we had laying around
rm -f ~$STACK_USER/.config/openstack/clouds.yaml rm -f $(eval echo ~"$STACK_USER")/.config/openstack/clouds.yaml
} }
# trueorfalse <True|False> <VAR> # trueorfalse <True|False> <VAR>