Merge branch 'master' into instances-path
Conflicts:
stack.sh
diff --git a/stack.sh b/stack.sh
index 4023058..80605de 100755
--- a/stack.sh
+++ b/stack.sh
@@ -129,7 +129,7 @@
fi
exit 1
else
- # Our user needs passwordless priviledges for certain commands which nova
+ # Our user needs passwordless priviledges for certain commands which nova
# uses internally.
# Natty uec images sudoers does not have a '#includedir'. add one.
sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
@@ -630,6 +630,8 @@
add_nova_flag "--rabbit_host=$RABBIT_HOST"
add_nova_flag "--rabbit_password=$RABBIT_PASSWORD"
add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT"
+if [ -n "$INSTANCES_PATH" ]; then
+ add_nova_flag "--instances_path=$INSTANCES_PATH"
if [ -n "$MULTI_HOST" ]; then
add_nova_flag "--multi_host=$MULTI_HOST"
add_nova_flag "--send_arp_for_ha=1"