openstack/devstack
Code Issues Proposed changes

remove clouds.yaml in clean.sh

Browse Source 
devstack failed to install because glance:
Could not determine a suitable URL for the plugin

patch I618ea8e27b49af360c905df85af06d9b1eef8407 tries
to fix this problem, but with a wrong way because path is not
correct, the clouds.yaml is not under /path/to/devstack/~/.config/openstack/
but ~/.config/openstack.

patch I8af6bd465f74099c560dddba6b5221dd79cbc965 tries to
fix this problem, but with a worng way to specify the path,
~$STACK_USER/.config/openstack/clouds.yaml will not expand with
a variable, only const string can.

$ whoami
zqfan
$ touch ~/.config/openstack/clouds.yaml
$ export STACK_USER=zqfan
$ rm -rf ~$STACK_USER/.config/openstack/clouds.yaml
$ ls ~/.config/openstack/
clouds.yaml

Change-Id: I549817d2f4638be615991c1726b39d270ba71357
ref: I618ea8e27b49af360c905df85af06d9b1eef8407
This commit is contained in:
ZhiQiang Fan 2016-04-12 20:26:33 +08:00
parent a344608ca9
commit 0b4a009e56
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clean.sh
View File

@ -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
View File

@ -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>