josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #117 from cloudbuilders/instances-path

Browse source 
allow instances path to be set in the script
This commit is contained in:
Jesse Andrews 2011-10-28 18:48:40 -07:00
commit defb3aa97a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
stack.sh
View file

@ -129,7 +129,7 @@ if [[ $EUID -eq 0 ]]; then
fi fi
exit 1 exit 1
else else
# Our user needs passwordless priviledges for certain commands which nova # Our user needs passwordless priviledges for certain commands which nova
# uses internally. # uses internally.
# Natty uec images sudoers does not have a '#includedir'. add one. # Natty uec images sudoers does not have a '#includedir'. add one.
sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers || sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
@ -630,6 +630,9 @@ add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"
add_nova_flag "--rabbit_host=$RABBIT_HOST" add_nova_flag "--rabbit_host=$RABBIT_HOST"
add_nova_flag "--rabbit_password=$RABBIT_PASSWORD" add_nova_flag "--rabbit_password=$RABBIT_PASSWORD"
add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT" add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT"
if [ -n "$INSTANCES_PATH" ]; then
add_nova_flag "--instances_path=$INSTANCES_PATH"
fi
if [ -n "$MULTI_HOST" ]; then if [ -n "$MULTI_HOST" ]; then
add_nova_flag "--multi_host=$MULTI_HOST" add_nova_flag "--multi_host=$MULTI_HOST"
add_nova_flag "--send_arp_for_ha=1" add_nova_flag "--send_arp_for_ha=1"