Skip to content

Commit 185c66e

Browse files
committed
Run swift-proxy from screen.
- Fixes bug 956172 Change-Id: I9a83d6afc04596bf84e3cf27a3f3f6f7b7d05180
1 parent 7c7dedb commit 185c66e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

stack.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,9 +1182,10 @@ if is_service_enabled swift; then
11821182
# We then can start rsync.
11831183
sudo /etc/init.d/rsync restart || :
11841184

1185-
# TODO: Bring some services in foreground.
1186-
# Launch all services.
1185+
# With swift-init we are first spawning all the swift services but kill the
1186+
# proxy service so we can run it in foreground in screen.
11871187
swift-init all restart
1188+
swift-init proxy stop
11881189

11891190
unset s swift_hash swift_auth_server
11901191
fi
@@ -1619,6 +1620,7 @@ screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_
16191620
screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF_DIR/$NOVA_CONF"
16201621
screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"
16211622
screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/apache2/error.log"
1623+
screen_it swift "cd $SWIFT_DIR && $SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONFIG_LOCATION}/proxy-server.conf -v"
16221624

16231625

16241626
# Install Images

0 commit comments

Comments
 (0)