Merge "Make multinode job voting"
This commit is contained in:
commit
2292536aad
@ -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
|
||||
@ -105,3 +104,4 @@
|
||||
jobs:
|
||||
- zun-tempest-docker-sql
|
||||
- zun-tempest-py35-docker-sql
|
||||
- zun-tempest-multinode-docker-sql
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user