Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronise 2023.1 with upstream #517

Merged
merged 7 commits into from
Jan 8, 2024
Merged

Synchronise 2023.1 with upstream #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2801ff6
Fix wsrep sync status task while switched to TCP/IP
mmalchuk Dec 2, 2023
3ce2fa8
Persist Neutron agent state files in volume
adamoswick Sep 26, 2023
128d7d9
Make designate bind9 cmdline configurable
keuko Sep 25, 2023
b52b1dc
Remove nova cell sync comment
Alex-Welsh Dec 21, 2023
3815a0a
Merge "Fix wsrep sync status task while switched to TCP/IP" into stab…
Jan 4, 2024
216525e
Merge "Remove nova cell sync comment" into stable/2023.1
Jan 4, 2024
09ca4bd
Fix long service restarts while using systemd
keuko Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/module_utils/kolla_systemd_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/designate/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/designate/templates/designate-backend-bind9.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/mariadb/tasks/restart_services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions ansible/roles/neutron/templates/neutron.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ansible/roles/nova/tasks/bootstrap_service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes non-persistent Neutron agent state data.
`LP2009884 <https://launchpad.net/bugs/2009884>`__
2 changes: 1 addition & 1 deletion releasenotes/notes/bug-2024554-6eb811364536f1e8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://launchpad.net/bugs/2024554>`__
5 changes: 5 additions & 0 deletions releasenotes/notes/bug-2048130-23b8174396bd3c69.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes long service restarts while using systemd
`LP#2048130 <https://bugs.launchpad.net/kolla-ansible/+bug/2048130>`__.