aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2026-01-28 12:36:27 +0000
committerGerrit Code Review <review@openstack.org>2026-01-28 12:36:27 +0000
commit2af46c13d294e299144a08690a04142a1edbf904 (patch)
treed3a7049e59c5d00427fdc240e3b3e4c982e1ccdd
parent1634aff6daf4be021e843626c2be1bad6cb377f9 (diff)
parent6a435e693f7df6babb24fe2fb1f9156383d21036 (diff)
downloadkolla-ansible-2af46c13d294e299144a08690a04142a1edbf904.tar.gz
kolla-ansible-2af46c13d294e299144a08690a04142a1edbf904.zip
Merge "cinder: apply cinder_api_workers to uWSGI"
-rw-r--r--ansible/roles/cinder/tasks/config.yml1
-rw-r--r--zuul.d/scenarios/cephadm.yaml4
2 files changed, 3 insertions, 2 deletions
diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml
index d63894fd7..059488fac 100644
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@@ -84,6 +84,7 @@
service_uwsgi_config_tls_cert: "/etc/cinder/certs/cinder-cert.pem"
service_uwsgi_config_tls_key: "/etc/cinder/certs/cinder-key.pem"
service_uwsgi_config_uid: "cinder"
+ service_uwsgi_config_workers: "{{ cinder_api_workers }}"
when:
- service | service_enabled_and_mapped_to_host
- cinder_wsgi_provider == "uwsgi"
diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml
index 1502b3052..365f511ca 100644
--- a/zuul.d/scenarios/cephadm.yaml
+++ b/zuul.d/scenarios/cephadm.yaml
@@ -4,9 +4,9 @@
parent: kolla-ansible-base
voting: false
files:
- - ^ansible/group_vars/all/(ceph|ceph-rgw|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey).yml
+ - ^ansible/group_vars/all/(ceph|ceph-rgw|cinder|common|fluentd|glance|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey).yml
- ^ansible/group_vars/baremetal/ansible-python-interpreter.yml
- - ^ansible/roles/(ceph-rgw|certificates|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey)/
+ - ^ansible/roles/(ceph-rgw|certificates|cinder|common|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|openvswitch|placement|proxysql|rabbitmq|valkey)/
- ^roles/cephadm/
vars:
kolla_ansible_setup_disks_file_path: "/var/lib/ceph-osd.img"