Skip to content

Commit fc1b975

Browse files
priteaupriteau
authored
Merge pull request #740 from stackhpc/upstream/master-2025-06-24
Synchronise master with upstream
2 parents 8aa212b + d1b1c55 commit fc1b975

File tree

13 files changed

+121
-30
lines changed

13 files changed

+121
-30
lines changed

‎ansible/roles/nova-cell/templates/nova.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ num_retries = 3
109109

110110
{% if enable_cinder | bool %}
111111
[cinder]
112-
interface = internal
112+
catalog_info = block-storage::internalURL
113113
os_region_name = {{ openstack_region_name }}
114114
auth_url = {{ keystone_internal_url }}
115115
auth_type = password

‎ansible/roles/nova/templates/nova.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ debug = {{ nova_logging_debug }}
6464

6565
{% if enable_cinder | bool %}
6666
[cinder]
67-
interface = internal
67+
catalog_info = block-storage::internalURL
6868
os_region_name = {{ openstack_region_name }}
6969
auth_url = {{ keystone_internal_url }}
7070
auth_type = password

‎ansible/roles/prometheus/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ prometheus_services:
121121
volumes: "{{ prometheus_elasticsearch_exporter_default_volumes + prometheus_elasticsearch_exporter_extra_volumes }}"
122122
dimensions: "{{ prometheus_elasticsearch_exporter_dimensions }}"
123123
prometheus-blackbox-exporter:
124+
cap_add:
125+
- CAP_NET_RAW
124126
container_name: "prometheus_blackbox_exporter"
125127
group: "prometheus-blackbox-exporter"
126128
enabled: "{{ enable_prometheus_blackbox_exporter | bool }}"

‎ansible/roles/prometheus/handlers/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
become: true
113113
kolla_container:
114114
action: "recreate_or_restart_container"
115+
cap_add: "{{ service.cap_add }}"
115116
common_options: "{{ docker_common_options }}"
116117
name: "{{ service.container_name }}"
117118
image: "{{ service.image }}"

‎releasenotes/notes/fix-invalid-cinder-endpoint-option-in-nova-conf-417aae41d82cbdb2.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes a bug where Cinder endpoint that Nova uses does not get
5+
overridden because of the use of invalid option.
6+
`LP#2115064 <https://bugs.launchpad.net/kolla-ansible/+bug/2115064>`__

‎tests/check-logs.sh

Lines changed: 95 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,75 @@ function check_fluentd_log_file_for_content {
2929
sudo egrep "$2" $1
3030
}
3131

32+
function check_fluentd_missing_logs {
33+
code=0
34+
for file in $(sudo find /var/log/kolla/ -type f -name '*.log' | grep -v '^$'); do
35+
case $file in
36+
/var/log/kolla/ansible.log)
37+
continue
38+
;;
39+
/var/log/kolla/etcd/etcd.log)
40+
continue
41+
;;
42+
/var/log/kolla/fluentd/fluentd.log)
43+
continue
44+
;;
45+
/var/log/kolla/glance-tls-proxy/glance-tls-proxy.log)
46+
continue
47+
;;
48+
/var/log/kolla/grafana/grafana.log)
49+
continue
50+
;;
51+
/var/log/kolla/haproxy/*)
52+
continue
53+
;;
54+
/var/log/kolla/ironic/dnsmasq.log)
55+
continue
56+
;;
57+
/var/log/kolla/mariadb/mariadb-bootstrap.log)
58+
continue
59+
;;
60+
/var/log/kolla/mariadb/mariadb-clustercheck.log)
61+
continue
62+
;;
63+
/var/log/kolla/mariadb/mariadb-upgrade.log)
64+
continue
65+
;;
66+
/var/log/kolla/neutron/dnsmasq.log)
67+
continue
68+
;;
69+
/var/log/kolla/neutron-tls-proxy/neutron-tls-proxy.log)
70+
continue
71+
;;
72+
/var/log/kolla/opensearch/*)
73+
continue
74+
;;
75+
/var/log/kolla/opensearch-dashboards/*)
76+
continue
77+
;;
78+
/var/log/kolla/openvswitch/*)
79+
continue
80+
;;
81+
/var/log/kolla/proxysql/proxysql.log)
82+
continue
83+
;;
84+
/var/log/kolla/rabbitmq/*upgrade.log)
85+
continue
86+
;;
87+
/var/log/kolla/redis/*)
88+
continue
89+
;;
90+
/var/log/kolla/skyline/skyline.log)
91+
continue
92+
;;
93+
*)
94+
sudo grep -q "following tail of $file" /var/log/kolla/fluentd/fluentd.log || echo "no match for $file" && code=1
95+
;;
96+
esac
97+
done
98+
return $code
99+
}
100+
32101
function check_docker_log_file_for_sigkill {
33102
sudo journalctl --no-pager -u ${CONTAINER_ENGINE}.service | grep "signal 9"
34103
}
@@ -82,26 +151,35 @@ for level in CRITICAL ERROR WARNING; do
82151
fi
83152
done
84153

85-
# check fluentd errors (we consider them critical)
86-
fluentd_log_file=/var/log/kolla/fluentd/fluentd.log
87-
fluentd_error_summary_file=/tmp/logs/kolla/fluentd-error.log
88-
if check_fluentd_log_file_for_level $fluentd_log_file error >/dev/null; then
89-
any_critical=1
90-
echo "(critical) Found some error log messages in fluentd logs. Matches in $fluentd_error_summary_file"
91-
check_fluentd_log_file_for_level $fluentd_log_file error > $fluentd_error_summary_file
92-
echo >> $fluentd_error_summary_file
93-
fi
154+
if [ -d /var/log/kolla ]; then
155+
# check fluentd errors (we consider them critical)
156+
fluentd_log_file=/var/log/kolla/fluentd/fluentd.log
157+
fluentd_error_summary_file=/tmp/logs/kolla/fluentd-error.log
158+
if check_fluentd_log_file_for_level $fluentd_log_file error >/dev/null; then
159+
any_critical=1
160+
echo "(critical) Found some error log messages in fluentd logs. Matches in $fluentd_error_summary_file"
161+
check_fluentd_log_file_for_level $fluentd_log_file error > $fluentd_error_summary_file
162+
echo >> $fluentd_error_summary_file
163+
fi
164+
165+
for string in "${fluentchecks[@]}"; do
166+
fluentd_file=/tmp/logs/kolla/fluentd-errors.log
167+
if check_fluentd_log_file_for_content $fluentd_log_file "$string" >/dev/null; then
168+
any_critical=1
169+
echo "(critical) Found some error log messages in fluentd logs. Matches in $fluentd_file"
170+
echo "Check: $string" >> $fluentd_file
171+
check_fluentd_log_file_for_content $fluentd_log_file "$string" >> $fluentd_file
172+
echo >> $fluentd_file
173+
fi
174+
done
94175

95-
for string in "${fluentchecks[@]}"; do
96-
fluentd_file=/tmp/logs/kolla/fluentd-errors.log
97-
if check_fluentd_log_file_for_content $fluentd_log_file "$string" >/dev/null; then
176+
if check_fluentd_missing_logs >/dev/null; then
98177
any_critical=1
99-
echo "(critical) Found some error log messages in fluentd logs. Matches in $fluentd_file"
100-
echo "Check: $string" >> $fluentd_file
101-
check_fluentd_log_file_for_content $fluentd_log_file "$string" >> $fluentd_file
102-
echo >> $fluentd_file
178+
echo "(critical) Found some missing log files in fluentd logs. Matches in $fluentd_error_summary_file"
179+
check_fluentd_missing_logs >> $fluentd_error_summary_file
180+
echo >> $fluentd_error_summary_file
103181
fi
104-
done
182+
fi
105183

106184
if check_docker_log_file_for_sigkill >/dev/null; then
107185
any_critical=1

‎tests/init-core-openstack.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ function init_runonce {
1313

1414
echo "Initialising OpenStack resources via init-runonce"
1515
KOLLA_DEBUG=1 tools/init-runonce |& gawk '{ print strftime("%F %T"), $0; }' &> /tmp/logs/ansible/init-runonce
16+
# CI flavors
17+
openstack flavor create --id 7 --ram 320 --disk 1 --vcpus 1 c1.tiny >> /tmp/logs/ansible/init-runonce
18+
openstack flavor create --id 8 --ram 384 --disk 1 --vcpus 2 c2.tiny >> /tmp/logs/ansible/init-runonce
1619

1720
if [[ $IP_VERSION -eq 6 ]]; then
1821
# NOTE(yoctozepto): In case of IPv6 there is no NAT support in Neutron,

‎tests/test-container-engine-migration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function create_instance {
1919
server_create_extra="${server_create_extra} --config-drive True"
2020
fi
2121

22-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
22+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
2323
# If the status is not ACTIVE, print info and exit 1
2424
if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
2525
echo "FAILED: Instance is not active"

‎tests/test-core-openstack.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function create_instance {
167167
server_create_extra="${server_create_extra} --config-drive True"
168168
fi
169169

170-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
170+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net ${server_create_extra} ${name}
171171
# If the status is not ACTIVE, print info and exit 1
172172
if [[ $(openstack server show ${name} -f value -c status) != "ACTIVE" ]]; then
173173
echo "FAILED: Instance is not active"
@@ -179,7 +179,7 @@ function create_instance {
179179
function resize_instance {
180180
local name=$1
181181

182-
openstack server resize --flavor m2.tiny --wait ${name}
182+
openstack server resize --flavor c2.tiny --wait ${name}
183183
# If the status is not VERIFY_RESIZE, print info and exit 1
184184
if [[ $(openstack server show ${name} -f value -c status) != "VERIFY_RESIZE" ]]; then
185185
echo "FAILED: Instance is not resized"
@@ -439,7 +439,7 @@ function test_internal_dns_integration {
439439
SERVER_NAME="my_vm"
440440
SERVER_NAME_SANITIZED=$(echo ${SERVER_NAME} | sed -e 's/_/-/g')
441441

442-
openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
442+
openstack server create --image cirros --flavor c1.tiny --network dns-test-network ${SERVER_NAME}
443443

444444
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
445445
attempt=0

‎tests/test-magnum.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function test_designate {
5858
openstack router set --external-gateway public1 router-dns-test
5959
openstack router add subnet router-dns-test tenant-dns-test
6060

61-
openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME}
61+
openstack server create --image cirros --flavor c1.tiny --network tenant-dns-test ${SERVER_NAME}
6262

6363
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
6464
attempt=0
@@ -131,7 +131,7 @@ EOF
131131

132132
DNS_DOMAIN="fixed.sink.example.org."
133133
SERVER_NAME="sink-server"
134-
openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test ${SERVER_NAME}
134+
openstack server create --image cirros --flavor c1.tiny --network tenant-dns-test ${SERVER_NAME}
135135

136136
check_if_resolvable "${DNS_DOMAIN}" "${SERVER_NAME}.${DNS_DOMAIN}" "A"
137137

‎tests/test-octavia.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function test_octavia {
3030
# Create a Loadblanacer
3131
openstack loadbalancer create --name lb --vip-subnet-id demo-subnet --wait
3232
# Create a server to act as a backend.
33-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net lb_member --wait
33+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net lb_member --wait
3434
member_fip=$(openstack floating ip create public1 -f value -c floating_ip_address)
3535
openstack server add floating ip lb_member ${member_fip}
3636
member_ip=$(openstack floating ip show ${member_fip} -f value -c fixed_ip_address)
@@ -132,7 +132,7 @@ function test_internal_dns_integration {
132132
SERVER_NAME="my_vm"
133133
SERVER_NAME_SANITIZED=$(echo ${SERVER_NAME} | sed -e 's/_/-/g')
134134

135-
openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
135+
openstack server create --image cirros --flavor c1.tiny --network dns-test-network ${SERVER_NAME}
136136

137137
SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
138138
attempt=0

‎tests/test-ovn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function test_octavia {
4747
openstack loadbalancer list
4848

4949
# Create a server to act as a backend
50-
openstack server create --wait --image cirros --flavor m1.tiny --key-name mykey --network demo-net lb_member --wait
50+
openstack server create --wait --image cirros --flavor c1.tiny --key-name mykey --network demo-net lb_member --wait
5151
member_fip=$(openstack floating ip create public1 -f value -c floating_ip_address)
5252
openstack server add floating ip lb_member ${member_fip}
5353
member_ip=$(openstack floating ip show ${member_fip} -f value -c fixed_ip_address)

‎zuul.d/project.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
- kolla-ansible-ubuntu-masakari
2525
- kolla-ansible-debian-ironic
2626
- kolla-ansible-ubuntu-ironic
27-
- kolla-ansible-debian-upgrade
27+
- kolla-ansible-debian-upgrade:
28+
voting: false
2829
- kolla-ansible-ubuntu-upgrade
2930
- kolla-ansible-ubuntu-cells
3031
- kolla-ansible-debian-mariadb
@@ -56,7 +57,7 @@
5657
jobs:
5758
- kolla-ansible-debian
5859
- kolla-ansible-debian-mariadb
59-
- kolla-ansible-debian-upgrade
60+
#- kolla-ansible-debian-upgrade
6061
- kolla-ansible-debian-podman
6162
- kolla-ansible-ubuntu
6263
- kolla-ansible-ubuntu-mariadb

0 commit comments

Comments
 (0)