Make multinode job voting

The multinode job is useful for catching issues on multinode
environment and this commit promote this job to voting.

In order to make the job success, this commit also fixes
two issues:
* Fix the nodeset of compute node (it should be 'subnode' instead
  of 'peers').
* Don't perform API-related configuration in compute node.

Change-Id: I16833dca7f442e5700a84dca042f04fb0edf25c7
This commit is contained in:
Hongbin Lu 2018-12-26 16:34:15 +00:00
parent 0c741b2458
commit 50c581766a
2 changed files with 9 additions and 7 deletions

View File

@ -47,7 +47,7 @@
KURYR_CAPABILITY_SCOPE: global
USE_PYTHON3: true
group-vars:
peers:
subnode:
devstack_localrc:
KURYR_CAPABILITY_SCOPE: global
KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
@ -73,7 +73,6 @@
- job:
name: zun-tempest-multinode-docker-sql
parent: zun-tempest-base-multinode
voting: false
- job:
name: zun-tempest-docker-etcd
@ -104,3 +103,4 @@
jobs:
- zun-tempest-docker-sql
- zun-tempest-py35-docker-sql
- zun-tempest-multinode-docker-sql

View File

@ -120,13 +120,15 @@ function configure_zun {
# Rebuild the config file from scratch
create_zun_conf
create_api_paste_conf
if is_service_enabled zun-api; then
create_api_paste_conf
write_uwsgi_config "$ZUN_UWSGI_CONF" "$ZUN_UWSGI" "/container"
write_uwsgi_config "$ZUN_UWSGI_CONF" "$ZUN_UWSGI" "/container"
if [[ "$USE_PYTHON3" = "True" ]]; then
# Switch off glance->swift communication as swift fails under py3.x
iniset /etc/glance/glance-api.conf glance_store default_store file
if [[ "$USE_PYTHON3" = "True" ]]; then
# Switch off glance->swift communication as swift fails under py3.x
iniset /etc/glance/glance-api.conf glance_store default_store file
fi
fi
}