openstack/kolla-ansible
Code Issues Proposed changes

Merge "[CI] Test ProxySQL with shards in the nova cells scenario"

Browse Source
This commit is contained in:
Zuul 2022-08-10 12:22:52 +00:00 committed by Gerrit Code Review
commit 1e5c54b234
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/setup_gate.sh
View File

@ -58,6 +58,10 @@ function prepare_images {
GATE_IMAGES+=",^cinder"
fi
if [[ $SCENARIO == "cells" ]]; then
GATE_IMAGES+=",^proxysql"
fi
if [[ $SCENARIO == "zun" ]]; then
GATE_IMAGES+=",^zun,^kuryr,^etcd,^cinder,^iscsid"
if [[ $BASE_DISTRO != "centos" ]]; then

1
tests/templates/globals-default.j2
View File

@ -109,6 +109,7 @@ enable_masakari: "yes"
{% if scenario == "cells" %}
enable_cells: "yes"
enable_proxysql: "yes"
{% endif %}
{% if scenario == "mariadb" %}

3
tests/templates/inventory.j2
View File

@ -65,7 +65,7 @@ control
{% for host in hostvars %}
{% set cell_name = 'cell' ~ loop.index %}
[{{ cell_name }}]
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} ansible_user=kolla ansible_ssh_private_key_file={{ ansible_env.HOME ~ '/.ssh/id_rsa_kolla' }}
{{ host }} ansible_host={{ hostvars[host]['ansible_host'] }} ansible_user=kolla ansible_ssh_private_key_file={{ ansible_env.HOME ~ '/.ssh/id_rsa_kolla' }} mariadb_shard_id={{ loop.index0 % 2 }}
[{{ cell_name }}:vars]
nova_cell_name = {{ cell_name }}
@ -73,6 +73,7 @@ nova_cell_compute_group = {{ cell_name }}
nova_cell_conductor_group = {{ cell_name }}
nova_cell_novncproxy_group = {{ cell_name }}
nova_novncproxy_port = {{ 6080 + loop.index0 }}
nova_cell_database_shard_id = {{ loop.index0 % 2 }}
{% endfor %}
{% endif %}