aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-11-29 11:13:18 +0000
committerGerrit Code Review <review@openstack.org>2023-11-29 11:13:18 +0000
commite971d0c79570a5a181fb81dd85a7307778c59c0f (patch)
tree3d399ea1511388e99a0b38f1acb530eda020209f /tests
parent65c219697516832a083c8e38dd8b2c3d0bb5bcd0 (diff)
parented3b27cc923144a9f437e931a5af3571e801ea33 (diff)
downloadkolla-ansible-e971d0c79570a5a181fb81dd85a7307778c59c0f.tar.gz
kolla-ansible-e971d0c79570a5a181fb81dd85a7307778c59c0f.zip
Merge "etcd: Add support for more scenarios"
Diffstat (limited to 'tests')
-rwxr-xr-xtests/setup_gate.sh2
-rw-r--r--tests/templates/globals-default.j24
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh
index 995edbe15..3a1a8f0ce 100755
--- a/tests/setup_gate.sh
+++ b/tests/setup_gate.sh
@@ -52,7 +52,7 @@ function prepare_images {
fi
if [[ $SCENARIO == "cephadm" ]]; then
- GATE_IMAGES+=",^cinder"
+ GATE_IMAGES+=",^cinder,^etcd"
fi
if [[ $SCENARIO == "cells" ]]; then
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 73029ab62..4ba6877a8 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -77,6 +77,7 @@ openstack_tag_suffix: "{{ docker_image_tag_suffix }}"
enable_zun: "yes"
enable_kuryr: "yes"
enable_etcd: "yes"
+etcd_remove_deleted_members: "yes"
docker_configure_for_zun: "yes"
containerd_configure_for_zun: "yes"
enable_cinder: "yes"
@@ -132,6 +133,9 @@ enable_cinder: "yes"
glance_backend_ceph: "yes"
cinder_backend_ceph: "yes"
nova_backend_ceph: "yes"
+# Internal etcd
+enable_etcd: "yes"
+etcd_remove_deleted_members: "yes"
enable_ceph_rgw: "yes"
ceph_rgw_hosts: