Merge pull request #173 from cloudbuilders/warm
script to warm apts/pips on a base image
diff --git a/files/apts/nova b/files/apts/nova
index 405d53b..9eefed7 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -1,4 +1,5 @@
dnsmasq-base
+dnsmasq-utils # for dhcp_release
kpartx
parted
arping # used for send_arp_for_ha option in nova-network
diff --git a/files/apts/preseed b/files/apts/preseed
deleted file mode 100644
index 8712d5d..0000000
--- a/files/apts/preseed
+++ /dev/null
@@ -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
diff --git a/files/glance-api.conf b/files/glance-api.conf
index 3499ff7..bb758af 100644
--- a/files/glance-api.conf
+++ b/files/glance-api.conf
@@ -24,7 +24,7 @@
# Log to this file. Make sure you do not set the same log
# 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`
use_syslog = %SYSLOG%
diff --git a/files/glance-registry.conf b/files/glance-registry.conf
index 351b09f..1e04186 100644
--- a/files/glance-registry.conf
+++ b/files/glance-registry.conf
@@ -13,7 +13,7 @@
# Log to this file. Make sure you do not set the same log
# file for both the API and registry servers!
-log_file = %DEST%/glance/registry.log
+#log_file = %DEST%/glance/registry.log
# Where to store images
filesystem_store_datadir = %DEST%/glance/images
diff --git a/stack.sh b/stack.sh
index 841cbb4..78851b9 100755
--- a/stack.sh
+++ b/stack.sh
@@ -826,6 +826,7 @@
add_nova_flag "--rabbit_host=$RABBIT_HOST"
add_nova_flag "--rabbit_password=$RABBIT_PASSWORD"
add_nova_flag "--glance_api_servers=$GLANCE_HOSTPORT"
+add_nova_flag "--force_dhcp_release"
if [ -n "$INSTANCES_PATH" ]; then
add_nova_flag "--instances_path=$INSTANCES_PATH"
fi
diff --git a/tools/build_uec.sh b/tools/build_uec.sh
index 6bab526..d57cb29 100755
--- a/tools/build_uec.sh
+++ b/tools/build_uec.sh
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
-# Make sure that we have the proper version of ubuntu (only works on natty/oneiric)
-if ! egrep -q "oneiric|natty" /etc/lsb-release; then
- echo "This script only works with ubuntu oneiric and natty"
+# Make sure that we have the proper version of ubuntu (only works on oneiric)
+if ! egrep -q "oneiric" /etc/lsb-release; then
+ echo "This script only works with ubuntu oneiric."
exit 1
fi
@@ -33,7 +33,7 @@
fi
# Install deps if needed
-DEPS="kvm libvirt-bin kpartx"
+DEPS="kvm libvirt-bin kpartx cloud-utils"
dpkg -l $DEPS || apt-get install -y --force-yes $DEPS
# Where to store files and instances