diff options
| author | Jan Gutter <jan.gutter@workday.com> | 2023-07-09 11:49:04 +0100 |
|---|---|---|
| committer | Dr. Jens Harbott <harbott@osism.tech> | 2023-11-28 18:43:56 +0100 |
| commit | ed3b27cc923144a9f437e931a5af3571e801ea33 (patch) | |
| tree | 907a9ce0bda10bf68bfd55abac398f9da27fd43e /tests | |
| parent | db79eb0a550fa6a5eb7edca7ed5ca2f75a9d1a6e (diff) | |
| download | kolla-ansible-ed3b27cc923144a9f437e931a5af3571e801ea33.tar.gz kolla-ansible-ed3b27cc923144a9f437e931a5af3571e801ea33.zip | |
etcd: Add support for more scenarios
This commit addresses a few shortcomings in the etcd service:
* Adding or removing etcd nodes required manual intervention.
* The etcd service would have brief outages during upgrades or
reconfigures because restarts weren't always serialised.
This makes the etcd service follow a similar pattern to mariadb:
* There is now a distiction between bootstrapping the cluster
and adding / removing another member.
* This more closely follows etcd's upstream bootstrapping
guidelines.
* The etcd role now serialises restarts internally so the
kolla_serial pattern is no longer appropriate (or necessary).
This does not remove the need for manual intervention in all
failure modes: the documentation has been updated to address the
most common issues.
Note that there's repetition in the container specifications: this
is somewhat deliberate. In a future cleanup, it's intended to reduce
the duplication.
Change-Id: I39829ba0c5894f8e549f9b83b416e6db4fafd96f
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup_gate.sh | 2 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 4 |
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: |