From 7ccea278279fa70a98c227a3a8c994feb94b40b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 6 May 2022 15:34:55 +0200 Subject: [PATCH] [CI] Raise [keystone_authtoken]http_request_max_retries This is in the hope to avoid random "Unable to validate token" in AIO upgrade jobs which restart the Keystone container while other services are trying to use it (most notably Placement but also Nova and Neutron). Change-Id: Ie6a95c3ca84df82ca8463cf76054e125cb1ffff1 --- tests/check-logs.sh | 5 ----- tests/run.yml | 4 ++++ tests/templates/global.conf.j2 | 7 +++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 tests/templates/global.conf.j2 diff --git a/tests/check-logs.sh b/tests/check-logs.sh index 4cdb0b2804..4a6f6ecf7a 100755 --- a/tests/check-logs.sh +++ b/tests/check-logs.sh @@ -28,15 +28,10 @@ function filter_out_expected_critical { # job. case $1 in - */placement-api.log) - # Sometimes we see this during upgrade when keystone is down. - grep -v "Failed to fetch token data from identity server" - ;; */neutron-server.log) # Sometimes we see this during shutdown (upgrade). # See: https://bugs.launchpad.net/neutron/+bug/1863579 grep -v "WSREP has not yet prepared node for application use" - grep -v "Failed to fetch token data from identity server" ;; *) # We have to provide some pass-through consumer to avoid: diff --git a/tests/run.yml b/tests/run.yml index 77aed9c5c3..e2c66f8b5d 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -162,6 +162,10 @@ # globals.yml - src: "tests/templates/globals-default.j2" dest: /etc/kolla/globals.yml + # global.conf + - src: "tests/templates/global.conf.j2" + dest: /etc/kolla/config/global.conf + when: "{{ openstack_core_enabled }}" # nova-compute.conf - src: "tests/templates/nova-compute-overrides.j2" dest: /etc/kolla/config/nova/nova-compute.conf diff --git a/tests/templates/global.conf.j2 b/tests/templates/global.conf.j2 new file mode 100644 index 0000000000..64f8aa2107 --- /dev/null +++ b/tests/templates/global.conf.j2 @@ -0,0 +1,7 @@ +[keystone_authtoken] +# NOTE(yoctozepto): This is to avoid CRITICAL messages in logs +# when services try to contact Keystone when it is down due +# to upgrade running, seen especially in AIO jobs, where there +# is no backup to respond, most often with Placement, but also +# with Neutron and Nova. +http_request_max_retries = 9