Merge pull request #557 from stackhpc/upstream/2023.1-2024-04-22

Synchronise 2023.1 with upstream
stackhpc · Apr 22, 2024 · 313b8ba · 313b8ba
2 parents bb5b248 + 31a48ba
commit 313b8ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
@@ -13,7 +13,7 @@ transport_url = {{ rpc_transport_url }}
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-heartbeat_in_pthread = true
+heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}

diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
@@ -476,7 +476,7 @@ workaround_ansible_issue_8743: yes
 #ceph_cinder_backup_pool_name: "backups"
 # Nova
 #ceph_nova_keyring: "{{ ceph_cinder_keyring }}"
-#ceph_nova_user: "nova"
+#ceph_nova_user: "{{ ceph_cinder_user }}"
 #ceph_nova_pool_name: "vms"
 # Gnocchi
 #ceph_gnocchi_keyring: "ceph.client.gnocchi.keyring"