From e347b990ceb091fb3b4e8d1924ee3f6bddaa7cba Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Fri, 16 Mar 2012 17:38:49 +0000 Subject: [PATCH] Don't enabled nova-objectstore if swift is enabled - Fixes bug 957178. Change-Id: Ieb2840344bf8c0d9a1da50925f5ca0649d9dad21 --- stack.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stack.sh b/stack.sh index 68b430e868..111f8ef8ba 100755 --- a/stack.sh +++ b/stack.sh @@ -1614,7 +1614,6 @@ fi # We don't check for is_service_enable as screen_it does it for us screen_it n-cpu "cd $NOVA_DIR && sg libvirtd $NOVA_DIR/bin/nova-compute" screen_it n-crt "cd $NOVA_DIR && $NOVA_DIR/bin/nova-cert" -screen_it n-obj "cd $NOVA_DIR && $NOVA_DIR/bin/nova-objectstore" screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume" screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network" screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler" @@ -1624,6 +1623,10 @@ screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth" screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/apache2/error.log" screen_it swift "cd $SWIFT_DIR && $SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONFIG_LOCATION}/proxy-server.conf -v" +# Starting the nova-objectstore only if swift service is not enabled. +# Swift will act as s3 objectstore. +is_service_enabled swift || \ + screen_it n-obj "cd $NOVA_DIR && $NOVA_DIR/bin/nova-objectstore" # Install Images # ==============