From 2801ff6a11921d2e64c11253effad04e35409a51 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Sun, 3 Dec 2023 00:46:40 +0300 Subject: [PATCH 1/5] Fix wsrep sync status task while switched to TCP/IP Followup on Id6eae798784126d4dd53adef15bdce6b47b4601f to fix an issue when a client with provided port set tries to connect 'localhost', so while we switch to TCP/IP we need to explicitly provide the host too. Partial-Bug: #2024554 Change-Id: Ib08c159dadd69a1f44924d658f4afe1e794a18b0 Signed-off-by: Maksim Malchuk (cherry picked from commit 35c7a9eb9d2c6dc3c9b695f148319f53bf4b8fe7) --- ansible/roles/mariadb/tasks/restart_services.yml | 3 ++- releasenotes/notes/bug-2024554-6eb811364536f1e8.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/roles/mariadb/tasks/restart_services.yml b/ansible/roles/mariadb/tasks/restart_services.yml index dcc178ef33..869525c3ba 100644 --- a/ansible/roles/mariadb/tasks/restart_services.yml +++ b/ansible/roles/mariadb/tasks/restart_services.yml @@ -31,7 +31,8 @@ become: true command: >- {{ kolla_container_engine }} exec {{ mariadb_service.container_name }} - mysql -uroot -p{{ database_password }} -P {{ mariadb_port }} + mysql -uroot -p{{ database_password }} + -h {{ api_interface_address }} -P {{ mariadb_port }} --silent --skip-column-names -e 'SHOW STATUS LIKE "wsrep_local_state_comment"' changed_when: false diff --git a/releasenotes/notes/bug-2024554-6eb811364536f1e8.yaml b/releasenotes/notes/bug-2024554-6eb811364536f1e8.yaml index 1db1d5a16f..19de8634b4 100644 --- a/releasenotes/notes/bug-2024554-6eb811364536f1e8.yaml +++ b/releasenotes/notes/bug-2024554-6eb811364536f1e8.yaml @@ -2,6 +2,6 @@ fixes: - | Fixes 2024554. - Adds mariadb_port to the wsrep sync status check. + Adds host and ``mariadb_port`` to the wsrep sync status check. This is so none standard ports can be used for mariadb deployments. `LP#2024554 `__ From 3ce2fa84f25a07f16d74405e162246009518cd3b Mon Sep 17 00:00:00 2001 From: Adam Oswick Date: Tue, 26 Sep 2023 11:40:52 +0100 Subject: [PATCH 2/5] Persist Neutron agent state files in volume The Neutron L3 agent stores state at state_path (/var/lib/neutron by default) and it is expected that these files persist across restarts. This change updates the Neutron state_path value to /var/lib/neutron/kolla (which is where the neutron_metadata_socket volume is mounted) so that these state files are stored there. Change-Id: I739aaf9e2d0b2b2e7f7b8f60ef8c2111d6873cef Signed-off-by: Adam Oswick Closes-Bug: #2009884 (cherry picked from commit 25244517e162a02e73503c56f9f370f9a71a1f7d) --- ansible/roles/neutron/templates/neutron.conf.j2 | 5 +---- releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index a95106143c..29c5593394 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -21,10 +21,7 @@ api_workers = {{ neutron_api_workers }} rpc_workers = {{ openstack_service_rpc_workers }} rpc_state_report_workers = {{ openstack_service_rpc_workers }} -# NOTE(SamYaple): We must specify this value here rather than the metadata conf -# because it is used by the l3 and dhcp agents. The reason the path has 'kolla' -# in it is because we are sharing this socket in a volume which is it's own dir -metadata_proxy_socket = /var/lib/neutron/kolla/metadata_proxy +state_path = /var/lib/neutron/kolla {% if neutron_plugin_agent == "openvswitch" or (neutron_plugin_agent == "ovn" and neutron_ovn_dhcp_agent | bool) %} interface_driver = openvswitch diff --git a/releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml b/releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml new file mode 100644 index 0000000000..944f58849a --- /dev/null +++ b/releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes non-persistent Neutron agent state data. + `LP2009884 `__ From 128d7d9c150744c10013c75f1d0cd97aa85d50a8 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Mon, 25 Sep 2023 11:42:27 +0200 Subject: [PATCH 3/5] Make designate bind9 cmdline configurable This simple patch adds an option to define extra cmdline parameters for bind. Closes-Bug: #2037272 Change-Id: Ia604bc669fdf97aba6c6345ad8a250dfb66cd375 (cherry picked from commit 21cff07c4911006626e6bed7574375340ea16fe9) --- ansible/roles/designate/defaults/main.yml | 1 + .../roles/designate/templates/designate-backend-bind9.json.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml index 926a358b44..212b6dc7d8 100644 --- a/ansible/roles/designate/defaults/main.yml +++ b/ansible/roles/designate/defaults/main.yml @@ -312,6 +312,7 @@ designate_dnssec_validation: "yes" designate_recursion: "no" ## Example for designate_forwarders_addresses: "10.199.200.1; 10.199.100.1" designate_forwarders_addresses: "" +designate_backend_bind9_cmdline_extras: "-U {{ designate_backend_bind9_workers }} -g" #################### # Infoblox diff --git a/ansible/roles/designate/templates/designate-backend-bind9.json.j2 b/ansible/roles/designate/templates/designate-backend-bind9.json.j2 index 49a786576c..36766addf5 100644 --- a/ansible/roles/designate/templates/designate-backend-bind9.json.j2 +++ b/ansible/roles/designate/templates/designate-backend-bind9.json.j2 @@ -2,7 +2,7 @@ {% set bind_file = 'bind/named.conf' if kolla_base_distro in ['ubuntu', 'debian'] else 'named.conf' %} { - "command": "/usr/sbin/{{ bind_cmd }} -U {{ designate_backend_bind9_workers }} -g", + "command": "/usr/sbin/{{ bind_cmd }} {{ designate_backend_bind9_cmdline_extras }}", "config_files": [ { "source": "{{ container_config_directory }}/named.conf", From b52b1dc9e4f179cc1fe73fe1e5d68e9225120d61 Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Thu, 21 Dec 2023 09:29:02 +0000 Subject: [PATCH 4/5] Remove nova cell sync comment Removed a comment suggesting we use nova-manage db sync --local_cell when bootstrapping the nova service, since that suggestion has now been implemented in Kolla. See [1] for more details. [1]: https://review.opendev.org/c/openstack/kolla/+/902057 Related-Bug: #2045558 Depends-On: Ic64eb51325b3503a14ebab9b9ff2f4d9caec734a Change-Id: I591f83c4886f5718e36011982c77c0ece6c4cbd7 (cherry picked from commit e9e7362f543e612779ac2fb661e7ebb90b0dac2b) --- ansible/roles/nova/tasks/bootstrap_service.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible/roles/nova/tasks/bootstrap_service.yml b/ansible/roles/nova/tasks/bootstrap_service.yml index 146ad02967..26b3217bec 100644 --- a/ansible/roles/nova/tasks/bootstrap_service.yml +++ b/ansible/roles/nova/tasks/bootstrap_service.yml @@ -1,6 +1,4 @@ --- -# TODO(mgoddard): We could use nova-manage db sync --local_cell, otherwise we -# sync cell0 twice. Should not be harmful without though. - name: Running Nova API bootstrap container become: true vars: From 09ca4bdcf5962a52edc95bdb015ca7e748443c0a Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Thu, 4 Jan 2024 22:26:13 +0100 Subject: [PATCH 5/5] Fix long service restarts while using systemd Some containers exiting with 143 instead of 0, but this is still OK. This patch just allows ExitCode 143 (SIGTERM) as fix. Details in bugreport. Services which exited with 143 (SIGTERM): kolla-cron-container.service kolla-designate_producer-container.service kolla-keystone_fernet-container.service kolla-letsencrypt_lego-container.service kolla-magnum_api-container.service kolla-mariadb_clustercheck-container.service kolla-neutron_l3_agent-container.service kolla-openvswitch_db-container.service kolla-openvswitch_vswitchd-container.service kolla-proxysql-container.service Partial-Bug: #2048130 Change-Id: Ia8c85d03404cfb368e4013066c67acd2a2f68deb (cherry picked from commit b1fd2b40f7cd1c6c457bd42b25ca32dc1e5e0f4f) --- ansible/module_utils/kolla_systemd_worker.py | 1 + releasenotes/notes/bug-2048130-23b8174396bd3c69.yaml | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 releasenotes/notes/bug-2048130-23b8174396bd3c69.yaml diff --git a/ansible/module_utils/kolla_systemd_worker.py b/ansible/module_utils/kolla_systemd_worker.py index 72c50b3164..43fe21f0a5 100644 --- a/ansible/module_utils/kolla_systemd_worker.py +++ b/ansible/module_utils/kolla_systemd_worker.py @@ -32,6 +32,7 @@ ExecStop=/usr/bin/docker stop ${name} -t ${graceful_timeout} Restart=${restart_policy} RestartSec=${restart_duration} +SuccessExitStatus=143 [Install] WantedBy=multi-user.target diff --git a/releasenotes/notes/bug-2048130-23b8174396bd3c69.yaml b/releasenotes/notes/bug-2048130-23b8174396bd3c69.yaml new file mode 100644 index 0000000000..a1cd5b878a --- /dev/null +++ b/releasenotes/notes/bug-2048130-23b8174396bd3c69.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes long service restarts while using systemd + `LP#2048130 `__.