Skip to content

Commit 453574c

Browse files
priteaupriteau
authored
Merge pull request #758 from stackhpc/upstream/2025.1-2025-07-21
Synchronise 2025.1 with upstream
2 parents 0ce20fd + 8b86f83 commit 453574c

File tree

8 files changed

+80
-3
lines changed

8 files changed

+80
-3
lines changed

‎ansible/roles/common/templates/conf/input/10-openvswitch.conf.j2‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,59 @@
2727
time_format %FT%T.%L
2828
</parse>
2929
</source>
30+
31+
{% if enable_ovn | bool %}
32+
{% if inventory_hostname in groups.get('ovn-controller', []) %}
33+
<source>
34+
@type tail
35+
path /var/log/kolla/openvswitch/ovn-controller.log
36+
pos_file /var/run/fluentd/ovn-controller.pos
37+
tag infra.ovn_controller
38+
enable_watch_timer {{ fluentd_enable_watch_timer }}
39+
<parse>
40+
@type multiline
41+
format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/
42+
format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3})Z\|\d{5,}\|(?<module>\S+)\|(?<log_level>\S+)\|(?<Payload>.*)/
43+
time_key Timestamp
44+
time_format %FT%T.%L
45+
</parse>
46+
</source>
47+
{% endif %}
48+
{% for ovn_service in ['ovn-nb-db', 'ovn-northd', 'ovn-sb-db'] %}
49+
{% if inventory_hostname in groups.get(ovn_service, []) %}
50+
51+
<source>
52+
@type tail
53+
path /var/log/kolla/openvswitch/{{ ovn_service }}.log
54+
pos_file /var/run/fluentd/{{ ovn_service }}.pos
55+
tag infra.{{ ovn_service | replace("-", "_") }}
56+
enable_watch_timer {{ fluentd_enable_watch_timer }}
57+
<parse>
58+
@type multiline
59+
format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/
60+
format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3})Z\|\d{5,}\|(?<module>\S+)\|(?<log_level>\S+)\|(?<Payload>.*)/
61+
time_key Timestamp
62+
time_format %FT%T.%L
63+
</parse>
64+
</source>
65+
{% endif %}
66+
{% endfor %}
67+
{% for relay_id in range(1, ovn_sb_db_relay_count | int + 1) %}
68+
{% if inventory_hostname in groups.get('ovn-sb-db-relay', []) %}
69+
<source>
70+
@type tail
71+
path /var/log/kolla/openvswitch/ovn-sb-relay-{{ relay_id }}.log
72+
pos_file /var/run/fluentd/ovn-sb-relay-{{ relay_id }}.pos
73+
tag infra.ovn-sb-relay-{{ relay_id }}
74+
enable_watch_timer {{ fluentd_enable_watch_timer }}
75+
<parse>
76+
@type multiline
77+
format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/
78+
format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3})Z\|\d{5,}\|(?<module>\S+)\|(?<log_level>\S+)\|(?<Payload>.*)/
79+
time_key Timestamp
80+
time_format %FT%T.%L
81+
</parse>
82+
</source>
83+
{% endif %}
84+
{% endfor %}
85+
{% endif %}

‎ansible/roles/common/templates/kolla-toolbox.json.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"dest": "/etc/rabbitmq/erl_inetrc",
1919
"owner": "rabbitmq",
2020
"perm": "0600"
21-
}{% endif %}{% if kolla_copy_ca_into_containers | bool %},
21+
}{% endif %}{% if kolla_copy_ca_into_containers | bool %}{% if enable_rabbitmq | bool %},{% endif %}
2222
{
2323
"source": "{{ container_config_directory }}/ca-certificates",
2424
"dest": "/var/lib/kolla/share/ca-certificates",

‎releasenotes/notes/bug-2111267-5bff269cf10a4239.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
In the kolla-toolbox configuration with external rabbitmq
5+
an unnecessary "comma" is generated, which is why the
6+
container does not want to start.
7+
`LP#2111267 <https://bugs.launchpad.net/kolla-ansible/+bug/2111267>`__

‎releasenotes/notes/nova-metadata-split-d1c9ff2010390352.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
features:
33
- |
4-
``nova-metadata`` service has been split into it's own container in
4+
The ``nova-metadata`` service has been split into its own container in
55
preparation for uWSGI support.

‎tests/run.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,15 @@
7373
become: true
7474
when: ansible_facts.os_family != 'RedHat'
7575

76+
# NOTE(kevko): Can be remove after [1] [2] will be merged in stable branches
77+
#
78+
# [1] https://review.opendev.org/c/openstack/kolla-ansible/+/949812
79+
# [2] https://review.opendev.org/c/openstack/ansible-collection-kolla/+/949767
7680
- name: Create Kolla runtime venv
7781
command:
7882
cmd: "{{ 'python3.12' if ansible_facts.os_family == 'RedHat' else 'python3' }} -m venv {{ kolla_runtime_venv_path }}"
7983
creates: "{{ kolla_runtime_venv_path }}"
84+
when: is_upgrade
8085

8186
- hosts: primary
8287
any_errors_fatal: true

‎tests/templates/globals-default.j2‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
---
2+
# Upgrade, virtualenv exist
3+
{% if is_previous_release %}
24
virtualenv: "{{ kolla_runtime_venv_path }}"
35
ansible_python_interpreter: "{{ kolla_runtime_venv_path }}/bin/python"
6+
{% else %}
7+
# New deployment - test virtualenv creation in debian, ubuntu scenarios
8+
{% if base_distro in ["debian", "ubuntu"] %}
9+
virtualenv: "{{ kolla_runtime_venv_path }}"
10+
{% endif %}
11+
{% endif %}
412

513
kolla_base_distro: "{{ base_distro }}"
614
network_interface: "{{ api_interface_name }}"

‎tests/test-core-openstack.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function test_ssh {
262262
local instance_name=$1
263263
local fip_addr=$2
264264
local attempts
265-
attempts=12
265+
attempts=30
266266
for i in $(seq 1 ${attempts}); do
267267
if ping -c1 -W1 ${fip_addr} && ssh -v -o BatchMode=yes -o StrictHostKeyChecking=no cirros@${fip_addr} hostname; then
268268
break

‎zuul.d/base.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
name: kolla-ansible-scenario-base
7272
files:
7373
- ^ansible/group_vars/all.yml
74+
- ^ansible/roles/common/
7475
- ^requirements-core.yml
7576
- ^tests/check-logs.sh
7677
- ^tests/get_logs.sh

0 commit comments

Comments
 (0)