commit 3a3a2bac674041f5bb92bc1ef59c7fc55a9946bd
author Dean Troyer <dtroyer@gmail.com> Tue Dec 11 15:26:24 2012 -0600
committer Dean Troyer <dtroyer@gmail.com> Thu Dec 20 14:46:57 2012 -0600
tree b74bf624e5d8091e2d73ebc92f551ccc7e918d8b
parent b0d8a8288be6ad23114563c4bf62338c79766501

Set up Nova for TLS

* Start n-api proxy if 'tls-proxy' is enabled
* Configure nova service catalog for TLS

Change-Id: If031eb315f76c5c441a25fe3582b626bbee73c6e

stack.sh

diff --git a/stack.sh b/stack.sh
index f2fd68c..a377217 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1568,12 +1568,7 @@
 # Launch the nova-api and wait for it to answer before continuing
 if is_service_enabled n-api; then
     echo_summary "Starting Nova API"
-    screen_it n-api "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-api"
-    echo "Waiting for nova-api to start..."
-    if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= wget -q -O- http://127.0.0.1:8774; do sleep 1; done"; then
-      echo "nova-api did not start"
-      exit 1
-    fi
+    start_nova_api
 fi
 
 if is_service_enabled q-svc; then