diff --git a/kingbird/tests/tempest/gate_hook.sh b/kingbird/tests/tempest/gate_hook.sh index 7696623..6d7e4ed 100755 --- a/kingbird/tests/tempest/gate_hook.sh +++ b/kingbird/tests/tempest/gate_hook.sh @@ -40,9 +40,10 @@ function _setup_kingbird_multinode { export DEVSTACK_LOCAL_CONFIG="enable_plugin kingbird https://git.openstack.org/openstack/kingbird" export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_KINGBIRD=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service kb-api" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service kb-api" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service kb-engine" export DEVSTACK_LOCAL_CONFIG+=$'\n'"REGION_NAME=RegionOne" export DEVSTACK_LOCAL_CONFIG+=$'\n'"HOST_IP=$PRIMARY_NODE_IP" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=False" export DEVSTACK_SUBNODE_CONFIG="REGION_NAME=RegionTwo" export DEVSTACK_SUBNODE_CONFIG+=$'\n'"HOST_IP=$SUBNODE_IP" @@ -50,6 +51,7 @@ function _setup_kingbird_multinode { export DEVSTACK_SUBNODE_CONFIG+=$'\n'"KEYSTONE_SERVICE_HOST=$PRIMARY_NODE_IP" export DEVSTACK_SUBNODE_CONFIG+=$'\n'"KEYSTONE_AUTH_HOST=$PRIMARY_NODE_IP" + export DEVSTACK_SUBNODE_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=False" export DEVSTACK_SUBNODE_CONFIG+=$'\n'"SERVICE_HOST=$SUBNODE_IP" export DEVSTACK_SUBNODE_CONFIG+=$'\n'"RABBIT_HOST=$SUBNODE_IP" export DEVSTACK_SUBNODE_CONFIG+=$'\n'"QPID_HOST=$SUBNODE_IP" diff --git a/kingbird/tests/tempest/post_test_hook.sh b/kingbird/tests/tempest/post_test_hook.sh index a8c69db..7f29d7e 100755 --- a/kingbird/tests/tempest/post_test_hook.sh +++ b/kingbird/tests/tempest/post_test_hook.sh @@ -77,7 +77,15 @@ iniset $TEMPEST_CONF validation connect_method fixed cd $TEMPEST_DIR # ping kingbird api -curl http://$PRIMARY_NODE_IP:8118 + +if curl -s --head --request GET http://$PRIMARY_NODE_IP:8118 | grep "200 OK" > /dev/null; then + echo "kb-api is UP" +else + echo "kb-api is DOWN" + exit 1 +fi + +echo "start Kingbird multi-region test..." # specify what kingbird test cases to be tested in TESTCASES environment # variables, then uncomment the follow line