Merge "start tls-proxy (if enabled) before checking for api"
This commit is contained in:
commit
a30ee72ec5
12
.zuul.yaml
12
.zuul.yaml
@ -16,6 +16,7 @@
|
|||||||
- watcher-tempest-workload_balancing
|
- watcher-tempest-workload_balancing
|
||||||
- watcherclient-tempest-functional
|
- watcherclient-tempest-functional
|
||||||
- watcher-tempest-zone_migration
|
- watcher-tempest-zone_migration
|
||||||
|
- watcher-tls-test
|
||||||
- openstack-tox-lower-constraints
|
- openstack-tox-lower-constraints
|
||||||
gate:
|
gate:
|
||||||
queue: watcher
|
queue: watcher
|
||||||
@ -58,6 +59,17 @@
|
|||||||
vars:
|
vars:
|
||||||
tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_zone_migration
|
tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_zone_migration
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: watcher-tls-test
|
||||||
|
parent: watcher-tempest-multinode
|
||||||
|
group-vars:
|
||||||
|
subnode:
|
||||||
|
devstack_services:
|
||||||
|
tls-proxy: true
|
||||||
|
vars:
|
||||||
|
devstack_services:
|
||||||
|
tls-proxy: true
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: watcher-tempest-multinode
|
name: watcher-tempest-multinode
|
||||||
parent: watcher-tempest-functional
|
parent: watcher-tempest-functional
|
||||||
|
@ -148,12 +148,17 @@ function create_watcher_accounts {
|
|||||||
function _config_watcher_apache_wsgi {
|
function _config_watcher_apache_wsgi {
|
||||||
local watcher_apache_conf
|
local watcher_apache_conf
|
||||||
if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
|
if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
|
||||||
|
local service_port=$WATCHER_SERVICE_PORT
|
||||||
|
if is_service_enabled tls-proxy; then
|
||||||
|
service_port=$WATCHER_SERVICE_PORT_INT
|
||||||
|
service_protocol="http"
|
||||||
|
fi
|
||||||
sudo mkdir -p $WATCHER_WSGI_DIR
|
sudo mkdir -p $WATCHER_WSGI_DIR
|
||||||
sudo cp $WATCHER_DIR/watcher/api/app.wsgi $WATCHER_WSGI_DIR/app.wsgi
|
sudo cp $WATCHER_DIR/watcher/api/app.wsgi $WATCHER_WSGI_DIR/app.wsgi
|
||||||
watcher_apache_conf=$(apache_site_config_for watcher-api)
|
watcher_apache_conf=$(apache_site_config_for watcher-api)
|
||||||
sudo cp $WATCHER_DEVSTACK_FILES_DIR/apache-watcher-api.template $watcher_apache_conf
|
sudo cp $WATCHER_DEVSTACK_FILES_DIR/apache-watcher-api.template $watcher_apache_conf
|
||||||
sudo sed -e "
|
sudo sed -e "
|
||||||
s|%WATCHER_SERVICE_PORT%|$WATCHER_SERVICE_PORT|g;
|
s|%WATCHER_SERVICE_PORT%|$service_port|g;
|
||||||
s|%WATCHER_WSGI_DIR%|$WATCHER_WSGI_DIR|g;
|
s|%WATCHER_WSGI_DIR%|$WATCHER_WSGI_DIR|g;
|
||||||
s|%USER%|$STACK_USER|g;
|
s|%USER%|$STACK_USER|g;
|
||||||
s|%APIWORKERS%|$API_WORKERS|g;
|
s|%APIWORKERS%|$API_WORKERS|g;
|
||||||
@ -288,15 +293,17 @@ function start_watcher_api {
|
|||||||
else
|
else
|
||||||
run_process watcher-api "$WATCHER_BIN_DIR/watcher-api --config-file $WATCHER_CONF"
|
run_process watcher-api "$WATCHER_BIN_DIR/watcher-api --config-file $WATCHER_CONF"
|
||||||
fi
|
fi
|
||||||
echo "Waiting for watcher-api to start..."
|
|
||||||
if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$WATCHER_SERVICE_HOST:$service_port; then
|
|
||||||
die $LINENO "watcher-api did not start"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start proxies if enabled
|
# Start proxies if enabled
|
||||||
if is_service_enabled tls-proxy; then
|
if is_service_enabled tls-proxy; then
|
||||||
start_tls_proxy watcher '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT
|
start_tls_proxy watcher '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "Waiting for watcher-api to start..."
|
||||||
|
if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$WATCHER_SERVICE_HOST:$service_port; then
|
||||||
|
die $LINENO "watcher-api did not start"
|
||||||
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# start_watcher() - Start running processes, including screen
|
# start_watcher() - Start running processes, including screen
|
||||||
|
Loading…
x
Reference in New Issue
Block a user