Merge "Keystone tenant ID's are no longer predictable (UUID's)"
diff --git a/files/apts/nova b/files/apts/nova
index 2d88151..4c91470 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -2,7 +2,8 @@
dnsmasq-utils # for dhcp_release only available in dist:oneiric
kpartx
parted
-arping # used for send_arp_for_ha option in nova-network
+arping # only available in dist:natty
+iputils-arping # only available in dist:oneiric
mysql-server # NOPRIME
python-mysqldb
python-xattr # needed for glance which is needed for nova --- this shouldn't be here
diff --git a/stack.sh b/stack.sh
index c7c5293..f978e44 100755
--- a/stack.sh
+++ b/stack.sh
@@ -118,7 +118,7 @@
echo "Copying files to stack user"
STACK_DIR="$DEST/${PWD##*/}"
- cp -r -f "$PWD" "$STACK_DIR"
+ cp -r -f -T "$PWD" "$STACK_DIR"
chown -R stack "$STACK_DIR"
if [[ "$SHELL_AFTER_RUN" != "no" ]]; then
exec su -c "set -e; cd $STACK_DIR; bash stack.sh; bash" stack
@@ -195,8 +195,8 @@
local testval=$2
[[ -z "$testval" ]] && { echo "$default"; return; }
- [[ "0 no false" =~ "$testval" ]] && { echo "False"; return; }
- [[ "1 yes true" =~ "$testval" ]] && { echo "True"; return; }
+ [[ "0 no false False FALSE" =~ "$testval" ]] && { echo "False"; return; }
+ [[ "1 yes true True TRUE" =~ "$testval" ]] && { echo "True"; return; }
echo "$default"
}
@@ -398,8 +398,8 @@
# - We are parsing the packages files and detecting metadatas.
# - If there is a NOPRIME as comment mean we are not doing the install
# just yet.
-# - If we have the meta-keyword distro:DISTRO or
-# distro:DISTRO1,DISTRO2 it will be installed only for those
+# - If we have the meta-keyword dist:DISTRO or
+# dist:DISTRO1,DISTRO2 it will be installed only for those
# distros (case insensitive).
function get_packages() {
local file_to_parse="general"