Merge "Not all distros include a symlink from euca-describe-group to euca-describe-groups"
diff --git a/files/swift/object-server.conf b/files/swift/object-server.conf
index 06fbffe..2f888a2 100644
--- a/files/swift/object-server.conf
+++ b/files/swift/object-server.conf
@@ -18,3 +18,5 @@
[object-updater]
[object-auditor]
+
+[object-expirer]
diff --git a/stack.sh b/stack.sh
index c0c30c2..beb9468 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1077,15 +1077,12 @@
fi
if sudo vgs $VOLUME_GROUP; then
+ # Remove nova iscsi targets
+ sudo tgtadm --op show --mode target | grep $VOLUME_NAME_PREFIX | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
# Clean out existing volumes
for lv in `sudo lvs --noheadings -o lv_name $VOLUME_GROUP`; do
# VOLUME_NAME_PREFIX prefixes the LVs we want
if [[ "${lv#$VOLUME_NAME_PREFIX}" != "$lv" ]]; then
- tid=`egrep "^tid.+$lv" /proc/net/iet/volume | cut -f1 -d' ' | tr ':' '='`
- if [[ -n "$tid" ]]; then
- lun=`egrep "lun.+$lv" /proc/net/iet/volume | cut -f1 -d' ' | tr ':' '=' | tr -d '\t'`
- sudo ietadm --op delete --$tid --$lun
- fi
sudo lvremove -f $VOLUME_GROUP/$lv
fi
done
@@ -1144,11 +1141,11 @@
add_nova_flag "--sql_connection=$BASE_SQL_CONN/nova"
add_nova_flag "--libvirt_type=$LIBVIRT_TYPE"
add_nova_flag "--instance_name_template=${INSTANCE_NAME_PREFIX}%08x"
-if [[ "$ENABLED_SERVICES" =~ "n-novnc" ]]; then
+# All nova-compute workers need to know the vnc configuration options
+# These settings don't hurt anything if n-xvnc and n-novnc are disabled
+if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}
add_nova_flag "--novncproxy_base_url=$NOVNCPROXY_URL"
-fi
-if [[ "$ENABLED_SERVICES" =~ "n-xvnc" ]]; then
XVPVNCPROXY_URL=${XVPVNCPROXY_URL:-"http://$SERVICE_HOST:6081/console"}
add_nova_flag "--xvpvncproxy_base_url=$XVPVNCPROXY_URL"
fi
@@ -1284,22 +1281,17 @@
function screen_it {
NL=`echo -ne '\015'`
if [[ "$ENABLED_SERVICES" =~ "$1" ]]; then
- if [[ "$USE_TMUX" =~ "yes" ]]; then
- tmux new-window -t stack -a -n "$1" "bash"
- tmux send-keys "$2" C-M
- else
- screen -S stack -X screen -t $1
- # sleep to allow bash to be ready to be send the command - we are
- # creating a new window in screen and then sends characters, so if
- # bash isn't running by the time we send the command, nothing happens
- sleep 1.5
- screen -S stack -p $1 -X stuff "$2$NL"
- fi
+ screen -S stack -X screen -t $1
+ # sleep to allow bash to be ready to be send the command - we are
+ # creating a new window in screen and then sends characters, so if
+ # bash isn't running by the time we send the command, nothing happens
+ sleep 1.5
+ screen -S stack -p $1 -X stuff "$2$NL"
fi
}
# create a new named screen to run processes in
-screen -d -m -S stack -t stack
+screen -d -m -S stack -t stack -s /bin/bash
sleep 1
# set a reasonable statusbar
screen -r stack -X hardstatus alwayslastline "%-Lw%{= BW}%50>%n%f* %t%{-}%+Lw%< %= %H"