Browse code

Merge pull request #117 from cloudbuilders/instances-path

allow instances path to be set in the script

Jesse Andrews authored on 2011/10/29 10:48:40
Showing 1 changed files
... ...
@@ -129,7 +129,7 @@ if [[ $EUID -eq 0 ]]; then
129 129
     fi
130 130
     exit 1
131 131
 else
132
-    # Our user needs passwordless priviledges for certain commands which nova 
132
+    # Our user needs passwordless priviledges for certain commands which nova
133 133
     # uses internally.
134 134
     # Natty uec images sudoers does not have a '#includedir'. add one.
135 135
     sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
... ...
@@ -630,6 +630,9 @@ add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"
630 630
 add_nova_flag "--rabbit_host=$RABBIT_HOST"
631 631
 add_nova_flag "--rabbit_password=$RABBIT_PASSWORD"
632 632
 add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT"
633
+if [ -n "$INSTANCES_PATH" ]; then
634
+    add_nova_flag "--instances_path=$INSTANCES_PATH"
635
+fi
633 636
 if [ -n "$MULTI_HOST" ]; then
634 637
     add_nova_flag "--multi_host=$MULTI_HOST"
635 638
     add_nova_flag "--send_arp_for_ha=1"