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

This commit is contained in:
Anthony Young 2011-11-09 12:43:36 -08:00
commit 2e7046dd49
5 changed files with 4 additions and 20 deletions

View file

@ -1,4 +1,5 @@
dnsmasq-base dnsmasq-base
dnsmasq-utils # for dhcp_release
kpartx kpartx
parted parted
arping # used for send_arp_for_ha option in nova-network arping # used for send_arp_for_ha option in nova-network

View file

@ -1,18 +0,0 @@
# a collection of packages that speed up installation as they are dependencies
# of packages we can't install during bootstraping (rabbitmq-server,
# mysql-server, libvirt-bin)
#
# NOTE: only add packages to this file that aren't needed directly
mysql-common
mysql-client-5.1
erlang-base
erlang-ssl
erlang-nox
erlang-inets
erlang-mnesia
libhtml-template-perl
gettext-base
libavahi-client3
libxml2-utils
libpciaccess0
libparted0debian1

View file

@ -24,7 +24,7 @@ registry_port = 9191
# Log to this file. Make sure you do not set the same log # Log to this file. Make sure you do not set the same log
# file for both the API and registry servers! # file for both the API and registry servers!
log_file = %DEST%/glance/api.log #log_file = %DEST%/glance/api.log
# Send logs to syslog (/dev/log) instead of to file specified by `log_file` # Send logs to syslog (/dev/log) instead of to file specified by `log_file`
use_syslog = %SYSLOG% use_syslog = %SYSLOG%

View file

@ -13,7 +13,7 @@ bind_port = 9191
# Log to this file. Make sure you do not set the same log # Log to this file. Make sure you do not set the same log
# file for both the API and registry servers! # file for both the API and registry servers!
log_file = %DEST%/glance/registry.log #log_file = %DEST%/glance/registry.log
# Where to store images # Where to store images
filesystem_store_datadir = %DEST%/glance/images filesystem_store_datadir = %DEST%/glance/images

View file

@ -826,6 +826,7 @@ 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"
add_nova_flag "--force_dhcp_release"
if [ -n "$INSTANCES_PATH" ]; then if [ -n "$INSTANCES_PATH" ]; then
add_nova_flag "--instances_path=$INSTANCES_PATH" add_nova_flag "--instances_path=$INSTANCES_PATH"
fi fi