commit c5affb48d6f0eab5d517bc8dc5ddbaeaa09a98c6
author Jenkins <jenkins@review.openstack.org> Thu Oct 03 21:12:28 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Oct 03 21:12:28 2013 +0000
tree 5edb512096389af4a3e88d0a0e1501da0a906fa6
parent a15f9092ec5bee27dd19ab3d848db07c26bec0c2
parent 1f3e19363808d03cea14cec620aab441d5d61ee9

Merge "Ensure SSL CA certificates are installed for curl"

functions

diff --git a/functions b/functions
index 83826f9..d9445fe 100644
--- a/functions
+++ b/functions
@@ -364,7 +364,7 @@
 # GetOSVersion
 GetOSVersion() {
     # Figure out which vendor we are
-    if [[ -n "`which sw_vers 2>/dev/null`" ]]; then
+    if [[ -x "`which sw_vers 2>/dev/null`" ]]; then
         # OS/X
         os_VENDOR=`sw_vers -productName`
         os_RELEASE=`sw_vers -productVersion`

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index bec65ed..ccf38b4 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -496,6 +496,8 @@
             # name, and would need to be adjusted too
             exit_distro_not_supported "restarting tgt"
         fi
+        # NOTE(gfidente): ensure tgtd is running in debug mode
+        sudo tgtadm --mode system --op update --name debug --value on
     fi
 
     screen_it c-api "cd $CINDER_DIR && $CINDER_BIN_DIR/cinder-api --config-file $CINDER_CONF"

lib/database

diff --git a/lib/database b/lib/database
index 442ed56..3c15609 100644
--- a/lib/database
+++ b/lib/database
@@ -64,7 +64,7 @@
 
     # For backward-compatibility, read in the MYSQL_HOST/USER variables and use
     # them as the default values for the DATABASE_HOST/USER variables.
-    MYSQL_HOST=${MYSQL_HOST:-localhost}
+    MYSQL_HOST=${MYSQL_HOST:-127.0.0.1}
     MYSQL_USER=${MYSQL_USER:-root}
 
     DATABASE_HOST=${DATABASE_HOST:-${MYSQL_HOST}}

lib/horizon

diff --git a/lib/horizon b/lib/horizon
index 5973eb2..63caf3c 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -130,8 +130,10 @@
             HORIZON_REQUIRE='Require all granted'
         fi
         sudo sed '/^Listen/s/^.*$/Listen 0.0.0.0:80/' -i /etc/httpd/conf/httpd.conf
+    elif is_suse; then
+        : # nothing to do
     else
-        exit_distro_not_supported "apache configuration"
+        exit_distro_not_supported "horizon apache configuration"
     fi
 
     # Remove old log files that could mess with how devstack detects whether Horizon

stack.sh

diff --git a/stack.sh b/stack.sh
index 03d5632..b39cd73 100755
--- a/stack.sh
+++ b/stack.sh
@@ -200,8 +200,8 @@
     ( umask 226 && echo "$STACK_USER ALL=(ALL) NOPASSWD:ALL" \
         > /etc/sudoers.d/50_stack_sh )
 
-    echo "Copying files to $STACK_USER user"
     STACK_DIR="$DEST/${TOP_DIR##*/}"
+    echo "Copying files to $STACK_DIR"
     cp -r -f -T "$TOP_DIR" "$STACK_DIR"
     safe_chown -R $STACK_USER "$STACK_DIR"
     cd "$STACK_DIR"

tools/xen/devstackubuntupreseed.cfg

diff --git a/tools/xen/devstackubuntupreseed.cfg b/tools/xen/devstackubuntupreseed.cfg
index c559b1e..6a1ae89 100644
--- a/tools/xen/devstackubuntupreseed.cfg
+++ b/tools/xen/devstackubuntupreseed.cfg
@@ -34,7 +34,7 @@
 
 # If you have a slow dhcp server and the installer times out waiting for
 # it, this might be useful.
-#d-i netcfg/dhcp_timeout string 60
+d-i netcfg/dhcp_timeout string 120
 
 # If you prefer to configure the network manually, uncomment this line and
 # the static network configuration below.

tools/xen/xenrc

diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index f698be1..6372ea7 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -13,7 +13,7 @@
 
 # Size of image
 VDI_MB=${VDI_MB:-5000}
-OSDOMU_MEM_MB=2048
+OSDOMU_MEM_MB=3072
 OSDOMU_VDI_GB=8
 
 # Network mapping. Specify bridge names or network names. Network names may