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.

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 master with upstream #679

Merged
merged 21 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
795fbb1
CI: Bump mariadb_monitor_galera_healthcheck_timeout to 30 seconds
mnasiadka Jan 8, 2025
884eacc
Prometheus: Fix target when TLS for rabbitmq is disabled
vurmil Jan 9, 2025
3a8bfc0
Support mounting host's /dev/shm into container
keuko Sep 9, 2024
15b5606
docs: define OPENSTACK_RELEASE
priteau Dec 10, 2024
e6b6e88
docs: fix link to Cinder HA page
priteau Jan 22, 2025
6460e97
Remove deleted nova option [api] use_forwarded_for
priteau Jan 22, 2025
330e68d
swift: Deprecate for removal in 2025.2
mnasiadka Jan 23, 2025
ce3b88f
Merge "Remove deleted nova option [api] use_forwarded_for"
Jan 27, 2025
c401fb4
Merge "docs: define OPENSTACK_RELEASE"
Jan 27, 2025
13e98d3
Merge "docs: fix link to Cinder HA page"
Jan 27, 2025
6eb6fee
fluentd: Add placement to list of supported services
mnasiadka Jan 23, 2025
fa65358
Reintroduce kolla-ansible check
markgoddard Sep 4, 2018
15f018b
Merge "Reintroduce kolla-ansible check"
Jan 28, 2025
454dc2a
placement: Add support for using uWSGI
mnasiadka Dec 10, 2024
d4b7dfd
Merge "swift: Deprecate for removal in 2025.2"
Jan 28, 2025
3641458
Merge "placement: Add support for using uWSGI"
Jan 28, 2025
b4c8edf
Merge "Support mounting host's /dev/shm into container"
Jan 29, 2025
a944fad
Set lock_path for openstack services
keuko Sep 9, 2024
e0b0dad
Merge "CI: Bump mariadb_monitor_galera_healthcheck_timeout to 30 seco…
Jan 29, 2025
9a9e36d
Merge "Set lock_path for openstack services"
Jan 29, 2025
3300fb7
Merge "Prometheus: Fix target when TLS for rabbitmq is disabled"
Jan 30, 2025
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/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ om_rabbitmq_cacert: "{{ rabbitmq_cacert }}"
om_enable_rabbitmq_high_availability: false
# Only enable quorum queues if you disable om_enable_rabbitmq_high_availability
om_enable_rabbitmq_quorum_queues: true
om_enable_queue_manager: false

####################
# Networking options
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/aodh/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,24 +181,28 @@ aodh_api_default_volumes:
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "aodh:/var/lib/aodh/"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
aodh_evaluator_default_volumes:
- "{{ node_config_directory }}/aodh-evaluator/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
aodh_listener_default_volumes:
- "{{ node_config_directory }}/aodh-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"
aodh_notifier_default_volumes:
- "{{ node_config_directory }}/aodh-notifier/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}"

aodh_extra_volumes: "{{ default_extra_volumes }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/aodh/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Aodh containers
import_role:
role: service-check
5 changes: 5 additions & 0 deletions ansible/roles/aodh/templates/aodh.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,8 @@ amqp_durable_queues = true
{% if om_enable_rabbitmq_quorum_queues | bool %}
rabbit_quorum_queue = true
{% endif %}

{% if om_enable_queue_manager | bool %}
[oslo_concurrency]
lock_path = /var/lib/aodh/tmp
{% endif %}
3 changes: 3 additions & 0 deletions ansible/roles/barbican/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,21 @@ barbican_api_default_volumes:
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "barbican:/var/lib/barbican/"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}"
barbican_keystone_listener_default_volumes:
- "{{ node_config_directory }}/barbican-keystone-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}"
barbican_worker_default_volumes:
- "{{ node_config_directory }}/barbican-worker/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}"

barbican_extra_volumes: "{{ default_extra_volumes }}"
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/barbican/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- name: Checking Barbican containers
import_role:
role: service-check
5 changes: 5 additions & 0 deletions ansible/roles/barbican/templates/barbican.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,8 @@ enable_proxy_headers_parsing = True
[oslo_policy]
policy_file = {{ barbican_policy_file }}
{% endif %}

{% if om_enable_queue_manager | bool %}
[oslo_concurrency]
lock_path = /var/lib/barbican/tmp
{% endif %}
2 changes: 2 additions & 0 deletions ansible/roles/blazar/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,14 @@ blazar_api_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/blazar:/dev-mode/blazar' if blazar_dev_mode | bool else '' }}"
blazar_manager_default_volumes:
- "{{ node_config_directory }}/blazar-manager/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/blazar:/dev-mode/blazar' if blazar_dev_mode | bool else '' }}"

blazar_extra_volumes: "{{ default_extra_volumes }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/blazar/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Blazar containers
import_role:
role: service-check
5 changes: 5 additions & 0 deletions ansible/roles/blazar/templates/blazar.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,8 @@ rabbit_quorum_queue = true
[oslo_policy]
policy_file = {{ blazar_policy_file }}
{% endif %}

{% if om_enable_queue_manager | bool %}
[oslo_concurrency]
lock_path = /var/lib/blazar/tmp
{% endif %}
4 changes: 4 additions & 0 deletions ansible/roles/ceilometer/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,15 @@ ceilometer_notification_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
ceilometer_central_default_volumes:
- "{{ node_config_directory }}/ceilometer-central/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "ceilometer:/var/lib/ceilometer/"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
ceilometer_compute_default_volumes:
- "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro"
Expand All @@ -139,6 +141,7 @@ ceilometer_compute_default_volumes:
- "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
- "ceilometer:/var/lib/ceilometer/"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ ceilometer_libvirt_volume }}:/var/lib/libvirt"
- "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"
ceilometer_ipmi_default_volumes:
Expand All @@ -147,6 +150,7 @@ ceilometer_ipmi_default_volumes:
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "ceilometer:/var/lib/ceilometer/"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/ceilometer:/dev-mode/ceilometer' if ceilometer_dev_mode | bool else '' }}"

ceilometer_extra_volumes: "{{ default_extra_volumes }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/ceilometer/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Ceilometer containers
import_role:
role: service-check
5 changes: 5 additions & 0 deletions ansible/roles/ceilometer/templates/ceilometer.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,8 @@ policy_file = {{ ceilometer_policy_file }}
backend = oslo_cache.memcache_pool
enabled = True
memcache_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}

{% if om_enable_queue_manager | bool %}
[oslo_concurrency]
lock_path = /var/lib/ceilometer/tmp
{% endif %}
2 changes: 2 additions & 0 deletions ansible/roles/cinder/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ cinder_api_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/cinder:/dev-mode/cinder' if cinder_dev_mode | bool else '' }}"
cinder_backup_default_volumes:
- "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
Expand All @@ -185,6 +186,7 @@ cinder_scheduler_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/cinder:/dev-mode/cinder' if cinder_dev_mode | bool else '' }}"
cinder_volume_default_volumes:
- "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/cinder/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- name: Checking Cinder containers
import_role:
role: service-check
2 changes: 2 additions & 0 deletions ansible/roles/cloudkitty/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,14 @@ cloudkitty_api_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/cloudkitty:/dev-mode/cloudkitty' if cloudkitty_dev_mode | bool else '' }}"
cloudkitty_processor_default_volumes:
- "{{ node_config_directory }}/cloudkitty-processor/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/cloudkitty:/dev-mode/cloudkitty' if cloudkitty_dev_mode | bool else '' }}"

cloudkitty_api_enable_healthchecks: "{{ enable_container_healthchecks }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/cloudkitty/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Cloudkitty containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/collectd/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Collectd containers
import_role:
role: service-check
2 changes: 2 additions & 0 deletions ansible/roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ fluentd_input_openstack_services:
enabled: "{{ enable_nova | bool }}"
- name: octavia
enabled: "{{ enable_octavia | bool }}"
- name: placement
enabled: "{{ enable_placement | bool }}"
- name: tacker
enabled: "{{ enable_tacker | bool }}"
- name: trove
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/common/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Common containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/cyborg/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,21 @@ cyborg_api_default_volumes:
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "cyborg:/var/lib/cyborg/"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"

cyborg_agent_default_volumes:
- "{{ node_config_directory }}/cyborg-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"

cyborg_conductor_default_volumes:
- "{{ node_config_directory }}/cyborg-conductor/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"

cyborg_extra_volumes: "{{ default_extra_volumes }}"
cyborg_api_extra_volumes: "{{ cyborg_extra_volumes }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/cyborg/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Cyborg containers
import_role:
role: service-check
5 changes: 5 additions & 0 deletions ansible/roles/cyborg/templates/cyborg.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,8 @@ amqp_durable_queues = true
{% if om_enable_rabbitmq_quorum_queues | bool %}
rabbit_quorum_queue = true
{% endif %}

{% if om_enable_queue_manager | bool %}
[oslo_concurrency]
lock_path = /var/lib/cyborg/tmp
{% endif %}
7 changes: 7 additions & 0 deletions ansible/roles/designate/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,42 +240,49 @@ designate_api_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
designate_backend_bind9_default_volumes:
- "{{ node_config_directory }}/designate-backend-bind9/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "designate_backend_bind9:/var/lib/named/"
designate_central_default_volumes:
- "{{ node_config_directory }}/designate-central/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
designate_mdns_default_volumes:
- "{{ node_config_directory }}/designate-mdns/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
designate_producer_default_volumes:
- "{{ node_config_directory }}/designate-producer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
designate_worker_default_volumes:
- "{{ node_config_directory }}/designate-worker/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"
designate_sink_default_volumes:
- "{{ node_config_directory }}/designate-sink/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}"

designate_extra_volumes: "{{ default_extra_volumes }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/designate/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Designate containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/etcd/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Etcd containers
import_role:
role: service-check
2 changes: 2 additions & 0 deletions ansible/roles/glance/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ glance_api_default_volumes:
- "{{ glance_file_datadir_volume }}:/var/lib/glance/"
- "{{ kolla_dev_repos_directory ~ '/glance:/dev-mode/glance' if glance_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
# NOTE(yoctozepto): below to support Cinder iSCSI backends
- "{% if enable_cinder | bool and enable_cinder_backend_iscsi | bool %}iscsi_info:/etc/iscsi{% endif %}"
- "{% if enable_cinder | bool and enable_cinder_backend_iscsi | bool %}/dev:/dev{% endif %}"
Expand All @@ -209,6 +210,7 @@ glance_tls_proxy_default_volumes:
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"

glance_extra_volumes: "{{ default_extra_volumes }}"
glance_api_extra_volumes: "{{ glance_extra_volumes }}"
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/glance/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- name: Checking Glance containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/gnocchi/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Gnocchi containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/grafana/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Grafana containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/hacluster/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Hacluster containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/heat/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,21 @@ heat_api_default_volumes:
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "{{ kolla_dev_repos_directory ~ '/heat:/dev-mode/heat' if heat_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
heat_api_cfn_default_volumes:
- "{{ node_config_directory }}/heat-api-cfn/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "{{ kolla_dev_repos_directory ~ '/heat:/dev-mode/heat' if heat_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"
heat_engine_default_volumes:
- "{{ node_config_directory }}/heat-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "{{ kolla_dev_repos_directory ~ '/heat:/dev-mode/heat' if heat_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{{ '/dev/shm:/dev/shm' if om_enable_queue_manager | bool else '' }}"

heat_extra_volumes: "{{ default_extra_volumes }}"
heat_api_extra_volumes: "{{ heat_extra_volumes }}"
Expand Down
3 changes: 3 additions & 0 deletions ansible/roles/heat/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Heat containers
import_role:
role: service-check
5 changes: 5 additions & 0 deletions ansible/roles/heat/templates/heat.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,8 @@ connection_string = {{ osprofiler_backend_connection_string }}

[volumes]
backups_enabled = {{ enable_cinder_backup | bool }}

{% if om_enable_queue_manager | bool %}
[oslo_concurrency]
lock_path = /var/lib/heat/tmp
{% endif %}
3 changes: 3 additions & 0 deletions ansible/roles/horizon/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Horizon containers
import_role:
role: service-check
3 changes: 3 additions & 0 deletions ansible/roles/influxdb/tasks/check.yml
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
---
- name: Checking Influxdb containers
import_role:
role: service-check
Loading