openstack
/
magnum
Code Issues Proposed changes

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<yuanying@fraction.jp>
Change-Id: Ic409818e5f85e6612390e490f4eeb17963bf3805
This commit is contained in:
Eli Qiao 2015-11-09 14:39:40 +08:00
parent 6bf2bcad88
commit ec39586fb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/magnum
View File

@ -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