Browse code

Merge remote-tracking branch 'origin/master' into jenkins

Anthony Young authored on 2011/11/10 05:43:36
Showing 5 changed files
... ...
@@ -1,4 +1,5 @@
1 1
 dnsmasq-base
2
+dnsmasq-utils # for dhcp_release
2 3
 kpartx
3 4
 parted
4 5
 arping # used for send_arp_for_ha option in nova-network
5 6
deleted file mode 100644
... ...
@@ -1,18 +0,0 @@
1
-# a collection of packages that speed up installation as they are dependencies
2
-# of packages we can't install during bootstraping (rabbitmq-server, 
3
-# mysql-server, libvirt-bin)
4
-#
5
-# NOTE: only add packages to this file that aren't needed directly
6
-mysql-common
7
-mysql-client-5.1
8
-erlang-base
9
-erlang-ssl 
10
-erlang-nox
11
-erlang-inets
12
-erlang-mnesia
13
-libhtml-template-perl
14
-gettext-base
15
-libavahi-client3
16
-libxml2-utils
17
-libpciaccess0
18
-libparted0debian1
... ...
@@ -24,7 +24,7 @@ registry_port = 9191
24 24
 
25 25
 # Log to this file. Make sure you do not set the same log
26 26
 # file for both the API and registry servers!
27
-log_file = %DEST%/glance/api.log
27
+#log_file = %DEST%/glance/api.log
28 28
 
29 29
 # Send logs to syslog (/dev/log) instead of to file specified by `log_file`
30 30
 use_syslog = %SYSLOG%
... ...
@@ -13,7 +13,7 @@ bind_port = 9191
13 13
 
14 14
 # Log to this file. Make sure you do not set the same log
15 15
 # file for both the API and registry servers!
16
-log_file = %DEST%/glance/registry.log
16
+#log_file = %DEST%/glance/registry.log
17 17
 
18 18
 # Where to store images
19 19
 filesystem_store_datadir = %DEST%/glance/images
... ...
@@ -826,6 +826,7 @@ add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"
826 826
 add_nova_flag "--rabbit_host=$RABBIT_HOST"
827 827
 add_nova_flag "--rabbit_password=$RABBIT_PASSWORD"
828 828
 add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT"
829
+add_nova_flag "--force_dhcp_release"
829 830
 if [ -n "$INSTANCES_PATH" ]; then
830 831
     add_nova_flag "--instances_path=$INSTANCES_PATH"
831 832
 fi