From ec39586fb16a241c9532f0d892e29b9013758931 Mon Sep 17 00:00:00 2001 From: Eli Qiao Date: Mon, 9 Nov 2015 14:39:40 +0800 Subject: [PATCH] Devstack: Use HOST_IP to set MAGNUM_SERVICE_HOST Magnum k8s functional testing will try to access m-api inside of a VM, the default setting of SERVICE_HOST is 127.0.0.1 which is not accessable from VM. This patch use HOST_IP instead of SERVICE_HOST. Closes-Bug: #1514286 o-Authored-By: OTSUKA, Yuanying Change-Id: Ic409818e5f85e6612390e490f4eeb17963bf3805 --- devstack/lib/magnum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index a65f6a87cb..1e287a1b03 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -50,7 +50,7 @@ if is_ssl_enabled_service "magnum" || is_service_enabled tls-proxy; then fi # Public facing bits -MAGNUM_SERVICE_HOST=${MAGNUM_SERVICE_HOST:-$SERVICE_HOST} +MAGNUM_SERVICE_HOST=${MAGNUM_SERVICE_HOST:-$HOST_IP} MAGNUM_SERVICE_PORT=${MAGNUM_SERVICE_PORT:-9511} MAGNUM_SERVICE_PORT_INT=${MAGNUM_SERVICE_PORT_INT:-19511} MAGNUM_SERVICE_PROTOCOL=${MAGNUM_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} @@ -263,7 +263,7 @@ function start_magnum_api { run_process m-api "$MAGNUM_BIN_DIR/magnum-api" echo "Waiting for magnum-api to start..." - if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$SERVICE_HOST:$service_port; then + if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$MAGNUM_SERVICE_HOST:$service_port; then die $LINENO "magnum-api did not start" fi