diff options
77 files changed, 112 insertions, 297 deletions
diff --git a/ansible/group_vars/all/common.yml b/ansible/group_vars/all/common.yml index 4664430f2..43cff1e27 100644 --- a/ansible/group_vars/all/common.yml +++ b/ansible/group_vars/all/common.yml @@ -205,7 +205,7 @@ kolla_container_engine: "docker" ######################### kolla_base_distro_version_default_map: { "centos": "stream10", - "debian": "bookworm", + "debian": "trixie", "rocky": "10", "ubuntu": "noble", } diff --git a/ansible/roles/aodh/defaults/main.yml b/ansible/roles/aodh/defaults/main.yml index 530601f7b..76d9360dd 100644 --- a/ansible/roles/aodh/defaults/main.yml +++ b/ansible/roles/aodh/defaults/main.yml @@ -182,7 +182,6 @@ aodh_notifier_healthcheck: aodh_api_default_volumes: - "{{ node_config_directory }}/aodh-api/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/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' }}" @@ -190,21 +189,18 @@ aodh_api_default_volumes: 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' }}" - "{{ 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' }}" - "{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/aodh/:/dev-mode/aodh' if aodh_dev_mode | bool else '' }}" diff --git a/ansible/roles/barbican/defaults/main.yml b/ansible/roles/barbican/defaults/main.yml index bf4985739..4c388d09e 100644 --- a/ansible/roles/barbican/defaults/main.yml +++ b/ansible/roles/barbican/defaults/main.yml @@ -139,7 +139,6 @@ barbican_worker_healthcheck: barbican_api_default_volumes: - "{{ node_config_directory }}/barbican-api/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/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' }}" @@ -147,14 +146,12 @@ barbican_api_default_volumes: 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' }}" - "{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/barbican:/dev-mode/barbican' if barbican_dev_mode | bool else '' }}" diff --git a/ansible/roles/blazar/defaults/main.yml b/ansible/roles/blazar/defaults/main.yml index f76d31649..34c8f68dd 100644 --- a/ansible/roles/blazar/defaults/main.yml +++ b/ansible/roles/blazar/defaults/main.yml @@ -125,14 +125,12 @@ blazar_manager_healthcheck: blazar_api_default_volumes: - "{{ node_config_directory }}/blazar-api/:{{ 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' }}" - "{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/blazar:/dev-mode/blazar' if blazar_dev_mode | bool else '' }}" diff --git a/ansible/roles/ceilometer/defaults/main.yml b/ansible/roles/ceilometer/defaults/main.yml index 7e41f8ba1..86f04b271 100644 --- a/ansible/roles/ceilometer/defaults/main.yml +++ b/ansible/roles/ceilometer/defaults/main.yml @@ -122,14 +122,12 @@ ceilometer_ipmi_healthcheck: ceilometer_notification_default_volumes: - "{{ node_config_directory }}/ceilometer-notification/:{{ 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' }}" - "{{ 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' }}" @@ -137,7 +135,6 @@ ceilometer_central_default_volumes: ceilometer_compute_default_volumes: - "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "ceilometer:/var/lib/ceilometer/" - "kolla_logs:/var/log/kolla/" @@ -147,7 +144,6 @@ ceilometer_compute_default_volumes: ceilometer_ipmi_default_volumes: - "{{ node_config_directory }}/ceilometer-ipmi/:{{ 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' }}" diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 10112fc35..1c45f4777 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -170,14 +170,12 @@ cinder_backup_healthcheck: cinder_api_default_volumes: - "{{ node_config_directory }}/cinder-api/:{{ 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' }}" - "{{ 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" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/lib/modules:/lib/modules:ro" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" @@ -188,14 +186,12 @@ cinder_backup_default_volumes: cinder_scheduler_default_volumes: - "{{ node_config_directory }}/cinder-scheduler/:{{ 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' }}" - "{{ 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" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/lib/modules:/lib/modules:ro" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 401785cf7..8f6e53db9 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/ansible/roles/cloudkitty/defaults/main.yml @@ -85,14 +85,12 @@ cloudkitty_api_dimensions: "{{ default_container_dimensions }}" cloudkitty_api_default_volumes: - "{{ node_config_directory }}/cloudkitty-api/:{{ 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' }}" - "{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/cloudkitty:/dev-mode/cloudkitty' if cloudkitty_dev_mode | bool else '' }}" diff --git a/ansible/roles/collectd/defaults/main.yml b/ansible/roles/collectd/defaults/main.yml index 0613b73a8..31d52df6d 100644 --- a/ansible/roles/collectd/defaults/main.yml +++ b/ansible/roles/collectd/defaults/main.yml @@ -22,7 +22,6 @@ collectd_default_volumes: - "{{ node_config_directory }}/collectd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/collectd/collectd.conf.d/:/etc/collectd/collectd.conf.d/" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "kolla_logs:/var/log/kolla/" - "/sys/:/sys/:ro" - "/dev/:/dev/:ro" diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index 0facf9f85..cf1a1485e 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -27,7 +27,6 @@ kolla_toolbox_image_full: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}" kolla_toolbox_default_volumes: - "{{ node_config_directory }}/kolla-toolbox/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/run/:/run/{{ ':shared' if kolla_container_engine == 'docker' else '' }}" # see: https://github.com/containers/podman/issues/16305 - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/cron/defaults/main.yml b/ansible/roles/cron/defaults/main.yml index 562b6ba44..902d402f0 100644 --- a/ansible/roles/cron/defaults/main.yml +++ b/ansible/roles/cron/defaults/main.yml @@ -22,7 +22,6 @@ cron_image_full: "{{ cron_image }}:{{ cron_tag }}" cron_default_volumes: - "{{ node_config_directory }}/cron/:{{ 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/" cron_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/cyborg/defaults/main.yml b/ansible/roles/cyborg/defaults/main.yml index 56577fccb..3f7868ae2 100644 --- a/ansible/roles/cyborg/defaults/main.yml +++ b/ansible/roles/cyborg/defaults/main.yml @@ -134,7 +134,6 @@ cyborg_conductor_healthcheck: cyborg_api_default_volumes: - "{{ node_config_directory }}/cyborg-api/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/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' }}" @@ -143,7 +142,6 @@ cyborg_api_default_volumes: 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' }}" - "{{ kolla_dev_repos_directory ~ '/cyborg:/dev-mode/cyborg' if cyborg_dev_mode | bool else '' }}" @@ -151,7 +149,6 @@ cyborg_agent_default_volumes: 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' }}" - "{{ kolla_dev_repos_directory ~ '/cyborg:/dev-mode/cyborg' if cyborg_dev_mode | bool else '' }}" diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml index 838684f68..8bea0fed8 100644 --- a/ansible/roles/designate/defaults/main.yml +++ b/ansible/roles/designate/defaults/main.yml @@ -244,49 +244,42 @@ designate_sink_healthcheck: designate_api_default_volumes: - "{{ node_config_directory }}/designate-api/:{{ 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' }}" - "{{ 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' }}" - "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' }}" - "{{ 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' }}" - "{{ 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' }}" - "{{ 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' }}" - "{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/designate:/dev-mode/designate' if designate_dev_mode | bool else '' }}" diff --git a/ansible/roles/etcd/defaults/main.yml b/ansible/roles/etcd/defaults/main.yml index 5a7d2ecb1..ab799e88e 100644 --- a/ansible/roles/etcd/defaults/main.yml +++ b/ansible/roles/etcd/defaults/main.yml @@ -65,7 +65,6 @@ etcd_dimensions: "{{ default_container_dimensions }}" etcd_default_volumes: - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "kolla_etcd:/var/lib/etcd/" - "kolla_logs:/var/log/kolla/" etcd_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/fluentd/defaults/main.yml b/ansible/roles/fluentd/defaults/main.yml index e6ccd915e..cdb6a8f47 100644 --- a/ansible/roles/fluentd/defaults/main.yml +++ b/ansible/roles/fluentd/defaults/main.yml @@ -50,7 +50,6 @@ syslog_facilities: fluentd_default_volumes: - "{{ node_config_directory }}/fluentd/:{{ 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/" - "fluentd_data:/var/lib/fluentd/data/" - "/var/log/journal:/var/log/journal:ro" diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index d42bec88d..e83d0aa90 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -149,7 +149,6 @@ glance_api_healthcheck: glance_api_default_volumes: - "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ 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/" diff --git a/ansible/roles/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml index d185fef64..32ba19ca4 100644 --- a/ansible/roles/gnocchi/defaults/main.yml +++ b/ansible/roles/gnocchi/defaults/main.yml @@ -138,21 +138,18 @@ gnocchi_statsd_healthcheck: gnocchi_api_default_volumes: - "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/" - "kolla_logs:/var/log/kolla/" gnocchi_metricd_default_volumes: - "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/" - "kolla_logs:/var/log/kolla/" gnocchi_statsd_default_volumes: - "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/" - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/grafana/defaults/main.yml b/ansible/roles/grafana/defaults/main.yml index 444cf01ed..e679f9805 100644 --- a/ansible/roles/grafana/defaults/main.yml +++ b/ansible/roles/grafana/defaults/main.yml @@ -89,7 +89,6 @@ grafana_dimensions: "{{ default_container_dimensions }}" grafana_default_volumes: - "{{ node_config_directory }}/grafana/:{{ 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/" grafana_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/hacluster/defaults/main.yml b/ansible/roles/hacluster/defaults/main.yml index 73b21dbd1..abd138076 100644 --- a/ansible/roles/hacluster/defaults/main.yml +++ b/ansible/roles/hacluster/defaults/main.yml @@ -61,19 +61,16 @@ hacluster_pacemaker_remote_dimensions: "{{ default_container_dimensions }}" hacluster_corosync_default_volumes: - "{{ node_config_directory }}/hacluster-corosync/:{{ 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/" - "hacluster_corosync:/var/lib/corosync" hacluster_pacemaker_default_volumes: - "{{ node_config_directory }}/hacluster-pacemaker/:{{ 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/" - "hacluster_pacemaker:/var/lib/pacemaker" hacluster_pacemaker_remote_default_volumes: - "{{ node_config_directory }}/hacluster-pacemaker-remote/:{{ 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/" - "hacluster_pacemaker_remote:/var/lib/pacemaker" diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml index e72b6040a..9769facd3 100644 --- a/ansible/roles/heat/defaults/main.yml +++ b/ansible/roles/heat/defaults/main.yml @@ -161,21 +161,18 @@ heat_engine_healthcheck: heat_api_default_volumes: - "{{ node_config_directory }}/heat-api/:{{ 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' }}" 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' }}" 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' }}" diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index 762899830..d17cb7d4f 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/ansible/roles/horizon/defaults/main.yml @@ -130,7 +130,6 @@ horizon_default_volumes: - "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro" - "{{ kolla_dev_repos_directory ~ '/horizon:/dev-mode/horizon' if horizon_dev_mode | bool else '' }}" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "kolla_logs:/var/log/kolla/" horizon_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/influxdb/defaults/main.yml b/ansible/roles/influxdb/defaults/main.yml index 59b6d14f0..c8a4b5fe0 100644 --- a/ansible/roles/influxdb/defaults/main.yml +++ b/ansible/roles/influxdb/defaults/main.yml @@ -34,7 +34,6 @@ influxdb_dimensions: "{{ default_container_dimensions }}" influxdb_default_volumes: - "{{ node_config_directory }}/influxdb/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ influxdb_datadir_volume }}:/var/lib/influxdb" - "kolla_logs:/var/log/kolla/" influxdb_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index 02042aad6..5c8bff526 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -196,14 +196,12 @@ ironic_http_healthcheck: ironic_api_default_volumes: - "{{ node_config_directory }}/ironic-api/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/ironic:/dev-mode/ironic' if ironic_dev_mode | bool else '' }}" ironic_conductor_default_volumes: - "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/sys:/sys" - "/dev:/dev" @@ -215,33 +213,28 @@ ironic_conductor_default_volumes: ironic_tftp_default_volumes: - "{{ node_config_directory }}/ironic-tftp/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "ironic:/var/lib/ironic" - "kolla_logs:/var/log/kolla" ironic_http_default_volumes: - "{{ node_config_directory }}/ironic-http/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "ironic:/var/lib/ironic" - "kolla_logs:/var/log/kolla" ironic_dnsmasq_default_volumes: - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "ironic_dhcp_hosts:/etc/dnsmasq/dhcp-hostsdir:ro" - "kolla_logs:/var/log/kolla" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" ironic_pxe_filter_default_volumes: - "{{ node_config_directory }}/ironic-pxe-filter/:{{ 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" - "ironic_dhcp_hosts:/etc/dnsmasq/dhcp-hostsdir" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" ironic_prometheus_exporter_default_volumes: - "{{ node_config_directory }}/ironic-prometheus-exporter/:{{ 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" - "ironic_prometheus_exporter_data:/var/lib/ironic-metrics" diff --git a/ansible/roles/iscsi/defaults/main.yml b/ansible/roles/iscsi/defaults/main.yml index f4d0ed1e8..8d94bcaf5 100644 --- a/ansible/roles/iscsi/defaults/main.yml +++ b/ansible/roles/iscsi/defaults/main.yml @@ -41,7 +41,6 @@ iscsid_default_volumes: - "{{ node_config_directory }}/iscsid/:{{ container_config_directory }}/:ro" - "kolla_logs:/var/log/kolla/" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "/lib/modules:/lib/modules:ro" @@ -51,7 +50,6 @@ tgtd_default_volumes: - "{{ node_config_directory }}/tgtd/:{{ container_config_directory }}/:ro" - "kolla_logs:/var/log/kolla/" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "/lib/modules:/lib/modules:ro" diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index 86bf9094c..dbdade4fe 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/ansible/roles/keystone/defaults/main.yml @@ -39,7 +39,6 @@ keystone_services: volumes: - "{{ node_config_directory }}/keystone-fernet/:{{ 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/" - "keystone_fernet_tokens:/etc/keystone/fernet-keys" dimensions: "{{ keystone_fernet_dimensions }}" @@ -60,7 +59,6 @@ keystone_services: volumes: - "{{ node_config_directory }}/keystone-ssh/:{{ 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/" - "keystone_fernet_tokens:/etc/keystone/fernet-keys" dimensions: "{{ keystone_ssh_dimensions }}" @@ -185,7 +183,6 @@ keystone_ssh_healthcheck: keystone_default_volumes: - "{{ node_config_directory }}/keystone/:{{ 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 ~ '/keystone:/dev-mode/keystone' if keystone_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" @@ -194,7 +191,6 @@ keystone_default_volumes: keystone_httpd_default_volumes: - "{{ node_config_directory }}/keystone-httpd/:{{ 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/" keystone_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/kuryr/defaults/main.yml b/ansible/roles/kuryr/defaults/main.yml index 753e0abf5..1b90c9d37 100644 --- a/ansible/roles/kuryr/defaults/main.yml +++ b/ansible/roles/kuryr/defaults/main.yml @@ -50,7 +50,6 @@ kuryr_healthcheck: kuryr_default_volumes: - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "/usr/lib/docker:/usr/lib/docker" diff --git a/ansible/roles/loadbalancer/defaults/main.yml b/ansible/roles/loadbalancer/defaults/main.yml index 7e25f7a76..68f77b42f 100644 --- a/ansible/roles/loadbalancer/defaults/main.yml +++ b/ansible/roles/loadbalancer/defaults/main.yml @@ -116,28 +116,24 @@ haproxy_ssh_healthcheck: haproxy_default_volumes: - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "haproxy_socket:/var/lib/kolla/haproxy/" - "letsencrypt_certificates:/etc/haproxy/certificates" proxysql_default_volumes: - "{{ node_config_directory }}/proxysql/:{{ 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/" - "proxysql:/var/lib/proxysql/" - "proxysql_socket:/var/lib/kolla/proxysql/" keepalived_default_volumes: - "{{ node_config_directory }}/keepalived/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "{{ 'haproxy_socket:/var/lib/kolla/haproxy/' if enable_haproxy | bool else '' }}" - "{{ 'proxysql_socket:/var/lib/kolla/proxysql/' if enable_proxysql | bool else '' }}" haproxy_ssh_default_volumes: - "{{ node_config_directory }}/haproxy-ssh/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "haproxy_socket:/var/lib/kolla/haproxy/" - "{{ 'letsencrypt:/etc/letsencrypt' if enable_letsencrypt | bool else omit }}" - "{{ 'letsencrypt_certificates:/etc/haproxy/certificates' if enable_letsencrypt | bool else omit }}" diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index fab0f4c56..45c6cb709 100644 --- a/ansible/roles/magnum/defaults/main.yml +++ b/ansible/roles/magnum/defaults/main.yml @@ -126,14 +126,12 @@ magnum_conductor_healthcheck: magnum_api_default_volumes: - "{{ node_config_directory }}/magnum-api/:{{ 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 ~ '/magnum:/dev-mode/magnum' if magnum_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" magnum_conductor_default_volumes: - "{{ node_config_directory }}/magnum-conductor/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "magnum:/var/lib/magnum/" - "{{ kolla_dev_repos_directory ~ '/magnum:/dev-mode/magnum' if magnum_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml index 1e973feb5..86af03cc1 100644 --- a/ansible/roles/manila/defaults/main.yml +++ b/ansible/roles/manila/defaults/main.yml @@ -165,7 +165,6 @@ manila_data_healthcheck: manila_share_default_volumes: - "{{ node_config_directory }}/manila-share/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" @@ -174,21 +173,18 @@ manila_share_default_volumes: manila_scheduler_default_volumes: - "{{ node_config_directory }}/manila-scheduler/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/manila:/dev-mode/manila' if manila_dev_mode | bool else '' }}" manila_api_default_volumes: - "{{ node_config_directory }}/manila-api/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/manila:/dev-mode/manila' if manila_dev_mode | bool else '' }}" manila_data_default_volumes: - "{{ node_config_directory }}/manila-data/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml index 31c5efb2a..59ce0c555 100644 --- a/ansible/roles/mariadb/defaults/main.yml +++ b/ansible/roles/mariadb/defaults/main.yml @@ -45,7 +45,6 @@ mariadb_dimensions: "{{ default_container_dimensions }}" mariadb_default_volumes: - "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ mariadb_datadir_volume }}:/var/lib/mysql" - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/masakari/defaults/main.yml b/ansible/roles/masakari/defaults/main.yml index 496a0f019..396726964 100644 --- a/ansible/roles/masakari/defaults/main.yml +++ b/ansible/roles/masakari/defaults/main.yml @@ -114,14 +114,12 @@ masakari_hostmonitor_extra_volumes: "{{ masakari_extra_volumes }}" masakari_api_default_volumes: - "{{ node_config_directory }}/masakari-api/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/masakari:/dev-mode/masakari' if masakari_dev_mode | bool else '' }}" masakari_engine_default_volumes: - "{{ node_config_directory }}/masakari-engine/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/masakari:/dev-mode/masakari' if masakari_dev_mode | bool else '' }}" @@ -129,14 +127,12 @@ masakari_engine_default_volumes: masakari_instancemonitor_default_volumes: - "{{ node_config_directory }}/masakari-instancemonitor/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/masakari-monitors:/dev-mode/masakari-monitors' if masakari_dev_mode | bool else '' }}" masakari_hostmonitor_default_volumes: - "{{ node_config_directory }}/masakari-hostmonitor/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/masakari-monitors:/dev-mode/masakari-monitors' if masakari_dev_mode | bool else '' }}" diff --git a/ansible/roles/memcached/defaults/main.yml b/ansible/roles/memcached/defaults/main.yml index 600be1a0c..358c2ecb5 100644 --- a/ansible/roles/memcached/defaults/main.yml +++ b/ansible/roles/memcached/defaults/main.yml @@ -45,7 +45,6 @@ memcached_healthcheck: memcached_default_volumes: - "{{ node_config_directory }}/memcached/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" memcached_extra_volumes: "{{ default_extra_volumes }}" #################### diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml index 486e86766..f4d9d14ef 100644 --- a/ansible/roles/mistral/defaults/main.yml +++ b/ansible/roles/mistral/defaults/main.yml @@ -163,28 +163,24 @@ mistral_executor_healthcheck: mistral_engine_default_volumes: - "{{ node_config_directory }}/mistral-engine/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}" mistral_event_engine_default_volumes: - "{{ node_config_directory }}/mistral-event-engine/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}" mistral_executor_default_volumes: - "{{ node_config_directory }}/mistral-executor/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}" mistral_api_default_volumes: - "{{ node_config_directory }}/mistral-api/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/mistral:/dev-mode/mistral' if mistral_dev_mode | bool else '' }}" diff --git a/ansible/roles/multipathd/defaults/main.yml b/ansible/roles/multipathd/defaults/main.yml index 0e4523924..8d9d5b625 100644 --- a/ansible/roles/multipathd/defaults/main.yml +++ b/ansible/roles/multipathd/defaults/main.yml @@ -21,7 +21,6 @@ multipathd_default_volumes: - "{{ node_config_directory }}/multipathd/:{{ container_config_directory }}/:ro" - "kolla_logs:/var/log/kolla/" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/dev/:/dev/" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "/lib/modules:/lib/modules:ro" diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index d9dacd4c2..9716b5a1b 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -529,7 +529,6 @@ neutron_rpc_server_healthcheck: neutron_dhcp_agent_default_volumes: - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "neutron_metadata_socket:/var/lib/neutron/kolla/" - "/run/netns:/run/netns:shared" - "kolla_logs:/var/log/kolla/" @@ -541,7 +540,6 @@ neutron_dhcp_agent_default_volumes: neutron_l3_agent_default_volumes: - "{{ node_config_directory }}/neutron-l3-agent/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "neutron_metadata_socket:/var/lib/neutron/kolla/" - "/run/netns:/run/netns:shared" @@ -554,14 +552,12 @@ neutron_l3_agent_default_volumes: neutron_sriov_agent_default_volumes: - "{{ node_config_directory }}/neutron-sriov-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' }}" - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}" neutron_mlnx_agent_default_volumes: - "{{ node_config_directory }}/neutron-mlnx-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' }}" - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}" @@ -569,14 +565,12 @@ neutron_eswitchd_default_volumes: - "{{ node_config_directory }}/neutron-eswitchd/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - "/run/libvirt:/run/libvirt:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}" neutron_metadata_agent_default_volumes: - "{{ node_config_directory }}/neutron-metadata-agent/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "neutron_metadata_socket:/var/lib/neutron/kolla/" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" @@ -596,7 +590,6 @@ neutron_ovn_metadata_agent_default_volumes: neutron_openvswitch_agent_default_volumes: - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run/openvswitch:/run/openvswitch:shared" - "kolla_logs:/var/log/kolla/" @@ -605,57 +598,48 @@ neutron_openvswitch_agent_default_volumes: neutron_server_default_volumes: - "{{ node_config_directory }}/neutron-server/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}" neutron_bgp_dragent_default_volumes: - "{{ node_config_directory }}/neutron-bgp-dragent/:{{ 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' }}" neutron_infoblox_ipam_agent_default_volumes: - "{{ node_config_directory }}/neutron-infoblox-ipam-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' }}" neutron_metering_agent_default_volumes: - "{{ node_config_directory }}/neutron-metering-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' }}" - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}" ironic_neutron_agent_default_volumes: - "{{ node_config_directory }}/ironic-neutron-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' }}" neutron_ovn_agent_default_volumes: - "{{ node_config_directory }}/neutron-ovn-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' }}" neutron_ovn_maintenance_worker_default_volumes: - "{{ node_config_directory }}/neutron-ovn-maintenance-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' }}" neutron_periodic_worker_default_volumes: - "{{ node_config_directory }}/neutron-periodic-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' }}" neutron_rpc_server_default_volumes: - "{{ node_config_directory }}/neutron-rpc-server/:{{ 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' }}" diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml index 1cc4a04aa..df8133ce7 100644 --- a/ansible/roles/nova-cell/defaults/main.yml +++ b/ansible/roles/nova-cell/defaults/main.yml @@ -410,7 +410,6 @@ nova_compute_ironic_healthcheck: nova_libvirt_default_volumes: - "{{ node_config_directory }}/nova-libvirt/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "/dev:/dev" @@ -425,7 +424,6 @@ nova_libvirt_default_volumes: nova_ssh_default_volumes: - "{{ node_config_directory }}/nova-ssh/:{{ 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" - "{{ nova_instance_datadir_volume }}:/var/lib/nova" - "{% if enable_shared_var_lib_nova_mnt | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}" @@ -433,35 +431,30 @@ nova_ssh_default_volumes: nova_novncproxy_default_volumes: - "{{ node_config_directory }}/nova-novncproxy/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" nova_spicehtml5proxy_default_volumes: - "{{ node_config_directory }}/nova-spicehtml5proxy/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" nova_serialproxy_default_volumes: - "{{ node_config_directory }}/nova-serialproxy/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" nova_conductor_default_volumes: - "{{ node_config_directory }}/nova-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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" nova_compute_default_volumes: - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" - "/dev:/dev" @@ -474,7 +467,6 @@ nova_compute_default_volumes: nova_compute_ironic_default_volumes: - "{{ node_config_directory }}/nova-compute-ironic/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" @@ -482,7 +474,6 @@ nova_compute_ironic_default_volumes: nova_cell_bootstrap_default_volumes: - "{{ node_config_directory }}/nova-cell-bootstrap/:{{ 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/" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" - "{{ 'nova-cell:/var/lib/script/' if kolla_container_engine == 'podman' else '' }}" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 9845b41b0..8910b80a4 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -183,7 +183,6 @@ nova_super_conductor_healthcheck: nova_api_default_volumes: - "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" @@ -191,20 +190,17 @@ nova_api_default_volumes: nova_metadata_default_volumes: - "{{ node_config_directory }}/nova-metadata/:{{ 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/" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" nova_scheduler_default_volumes: - "{{ node_config_directory }}/nova-scheduler/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" nova_super_conductor_default_volumes: - "{{ node_config_directory }}/nova-super-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' }}" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" @@ -212,7 +208,6 @@ nova_super_conductor_default_volumes: nova_api_bootstrap_default_volumes: - "{{ node_config_directory }}/nova-api-bootstrap/:{{ 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/" - "{{ kolla_dev_repos_directory ~ '/nova:/dev-mode/nova' if nova_dev_mode | bool else '' }}" diff --git a/ansible/roles/octavia/defaults/main.yml b/ansible/roles/octavia/defaults/main.yml index 4930a0768..6ebca8001 100644 --- a/ansible/roles/octavia/defaults/main.yml +++ b/ansible/roles/octavia/defaults/main.yml @@ -194,7 +194,6 @@ octavia_worker_healthcheck: octavia_api_default_volumes: - "{{ node_config_directory }}/octavia-api/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}" @@ -202,14 +201,12 @@ octavia_api_default_volumes: octavia_health_manager_default_volumes: - "{{ node_config_directory }}/octavia-health-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' }}" - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}" octavia_driver_agent_default_volumes: - "{{ node_config_directory }}/octavia-driver-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' }}" - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}" @@ -217,14 +214,12 @@ octavia_driver_agent_default_volumes: octavia_housekeeping_default_volumes: - "{{ node_config_directory }}/octavia-housekeeping/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}" octavia_worker_default_volumes: - "{{ node_config_directory }}/octavia-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' }}" - "{{ kolla_dev_repos_directory ~ '/octavia:/dev-mode/octavia' if octavia_dev_mode | bool else '' }}" diff --git a/ansible/roles/opensearch/defaults/main.yml b/ansible/roles/opensearch/defaults/main.yml index f2c13bf68..cd398f0df 100644 --- a/ansible/roles/opensearch/defaults/main.yml +++ b/ansible/roles/opensearch/defaults/main.yml @@ -174,13 +174,11 @@ opensearch_dashboards_healthcheck: opensearch_default_volumes: - "{{ node_config_directory }}/opensearch/:{{ container_config_directory }}/" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ opensearch_datadir_volume }}:/var/lib/opensearch/data" - "kolla_logs:/var/log/kolla/" opensearch_dashboards_default_volumes: - "{{ node_config_directory }}/opensearch-dashboards/:{{ 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/" opensearch_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/openvswitch/defaults/main.yml b/ansible/roles/openvswitch/defaults/main.yml index 284ba0e70..aea56f828 100644 --- a/ansible/roles/openvswitch/defaults/main.yml +++ b/ansible/roles/openvswitch/defaults/main.yml @@ -79,7 +79,6 @@ openvswitch_vswitchd_healthcheck: openvswitch_db_default_volumes: - "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run/openvswitch:/run/openvswitch:shared" - "kolla_logs:/var/log/kolla/" @@ -87,7 +86,6 @@ openvswitch_db_default_volumes: openvswitch_vswitchd_default_volumes: - "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run/openvswitch:/run/openvswitch:shared" - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/ovs-dpdk/defaults/main.yml b/ansible/roles/ovs-dpdk/defaults/main.yml index 0ce66ff2a..2a141d823 100644 --- a/ansible/roles/ovs-dpdk/defaults/main.yml +++ b/ansible/roles/ovs-dpdk/defaults/main.yml @@ -73,14 +73,12 @@ ovsdpdk_vswitchd_dimensions: "{{ default_container_dimensions }}" ovsdpdk_db_default_volumes: - "{{ node_config_directory }}/ovsdpdk-db/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/run/openvswitch:/run/openvswitch:shared" - "kolla_logs:/var/log/kolla/" - "ovsdpdk_db:/var/lib/openvswitch/" ovsdpdk_vswitchd_default_volumes: - "{{ node_config_directory }}/ovsdpdk-vswitchd/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/lib/modules:/lib/modules:ro" - "/run/openvswitch:/run/openvswitch:shared" - "/dev:/dev:shared" diff --git a/ansible/roles/placement/defaults/main.yml b/ansible/roles/placement/defaults/main.yml index ff1b9d168..ea8999425 100644 --- a/ansible/roles/placement/defaults/main.yml +++ b/ansible/roles/placement/defaults/main.yml @@ -88,7 +88,6 @@ placement_api_healthcheck: placement_api_default_volumes: - "{{ node_config_directory }}/placement-api/:{{ 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/" - "{{ kolla_dev_repos_directory ~ '/placement:/dev-mode/placement' if placement_dev_mode | bool else '' }}" diff --git a/ansible/roles/prechecks/tasks/datetime_checks.yml b/ansible/roles/prechecks/tasks/datetime_checks.yml index 2767bdfe0..619cfa3c9 100644 --- a/ansible/roles/prechecks/tasks/datetime_checks.yml +++ b/ansible/roles/prechecks/tasks/datetime_checks.yml @@ -10,18 +10,3 @@ /etc/localtime is not found. This file is used for system-wide time settings and Kolla Ansible needs this file for mounting it to containers. when: not etc_localtime.stat.exists - -- name: Check Debian timezone configuration - when: ansible_facts.os_family == 'Debian' - block: - - name: Ensure /etc/timezone exist - stat: - path: /etc/timezone - register: etc_timezone - - - name: Fail if /etc/timezone is absent - fail: - msg: >- - /etc/timezone is not found. This file is used for system-wide timezone - settings and Kolla Ansible needs this file for mounting it to containers. - when: not etc_timezone.stat.exists diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 1da91bb29..069d89d84 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -8,11 +8,13 @@ ansible_version_max: '2.19' # These map to lists of supported releases (ansible_facts.distribution_release) or # versions (ansible_facts.distribution_version or ansible_facts.distribution_major_version) # for that distribution. +# TODO(mnasiadka): Remove bookworm in 2026.2 host_os_distributions: CentOS: - "10" Debian: - "bookworm" + - "trixie" Rocky: - "10" Ubuntu: diff --git a/ansible/roles/prometheus-node-exporters/defaults/main.yml b/ansible/roles/prometheus-node-exporters/defaults/main.yml index 419e56902..bb233d19d 100644 --- a/ansible/roles/prometheus-node-exporters/defaults/main.yml +++ b/ansible/roles/prometheus-node-exporters/defaults/main.yml @@ -38,13 +38,11 @@ prometheus_cadvisor_dimensions: "{{ default_container_dimensions }}" prometheus_node_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-node-exporter/:{{ 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/" - "/:/host:ro,rslave" prometheus_cadvisor_default_volumes: - "{{ node_config_directory }}/prometheus-cadvisor/:{{ 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/" - "/:/rootfs:ro" - "/var/run:/var/run:rw" diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index f77d3b65e..02e1f4a22 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -374,44 +374,36 @@ prometheus_libvirt_exporter_dimensions: "{{ default_container_dimensions }}" prometheus_server_default_volumes: - "{{ node_config_directory }}/prometheus-server/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "prometheus_server:/var/lib/prometheus" - "kolla_logs:/var/log/kolla/" prometheus_mysqld_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-mysqld-exporter/:{{ 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/" prometheus_memcached_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-memcached-exporter/:{{ 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/" prometheus_alertmanager_default_volumes: - "{{ node_config_directory }}/prometheus-alertmanager/:{{ 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/" - "prometheus:/var/lib/prometheus" prometheus_openstack_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-openstack-exporter/:{{ 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/" prometheus_elasticsearch_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-elasticsearch-exporter/:{{ 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/" prometheus_blackbox_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-blackbox-exporter/:{{ 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/" prometheus_libvirt_exporter_default_volumes: - "{{ node_config_directory }}/prometheus-libvirt-exporter/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "/run/libvirt:/run/libvirt:ro" prometheus_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index 3a329b187..8326bf1fd 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/ansible/roles/rabbitmq/defaults/main.yml @@ -48,7 +48,6 @@ rabbitmq_healthcheck: rabbitmq_default_volumes: - "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ rabbitmq_datadir_volume }}:/var/lib/rabbitmq/" - "kolla_logs:/var/log/kolla/" rabbitmq_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/skyline/defaults/main.yml b/ansible/roles/skyline/defaults/main.yml index 49abc60ad..3c4bdab19 100644 --- a/ansible/roles/skyline/defaults/main.yml +++ b/ansible/roles/skyline/defaults/main.yml @@ -125,13 +125,11 @@ skyline_console_healthcheck: skyline_apiserver_default_volumes: - "{{ node_config_directory }}/skyline-apiserver/:{{ 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/" skyline_console_default_volumes: - "{{ node_config_directory }}/skyline-console/:{{ 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/" skyline_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/tacker/defaults/main.yml b/ansible/roles/tacker/defaults/main.yml index 994afd0ad..b3e23b8da 100644 --- a/ansible/roles/tacker/defaults/main.yml +++ b/ansible/roles/tacker/defaults/main.yml @@ -112,7 +112,6 @@ tacker_server_default_volumes: - "{{ node_config_directory }}/tacker-server/:{{ container_config_directory }}/:ro" - "{{ kolla_dev_repos_directory ~ '/tacker:/dev-mode/tacker' if tacker_dev_mode | bool else '' }}" - "/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' }}" # NOTE(yoctozepto): Starting in Train, this volume must be shared @@ -122,7 +121,6 @@ tacker_conductor_default_volumes: - "{{ node_config_directory }}/tacker-conductor/:{{ container_config_directory }}/:ro" - "{{ kolla_dev_repos_directory ~ '/tacker:/dev-mode/tacker' if tacker_dev_mode | bool else '' }}" - "/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' }}" - "kolla_tacker_vnfpackages:/var/lib/tacker/vnfpackages/" diff --git a/ansible/roles/telegraf/defaults/main.yml b/ansible/roles/telegraf/defaults/main.yml index 5531d0ca0..ed46711a4 100644 --- a/ansible/roles/telegraf/defaults/main.yml +++ b/ansible/roles/telegraf/defaults/main.yml @@ -20,7 +20,6 @@ telegraf_dimensions: "{{ default_container_dimensions }}" telegraf_default_volumes: - "{{ node_config_directory }}/telegraf/:{{ 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/" - "/sys:/rootfs/sys:ro" - "/proc:/rootfs/proc:ro" diff --git a/ansible/roles/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml index 1bb1e469c..1d9e259cb 100644 --- a/ansible/roles/trove/defaults/main.yml +++ b/ansible/roles/trove/defaults/main.yml @@ -139,7 +139,6 @@ trove_taskmanager_healthcheck: trove_api_default_volumes: - "{{ node_config_directory }}/trove-api/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/trove:/dev-mode/trove' if trove_dev_mode | bool else '' }}" @@ -147,7 +146,6 @@ trove_api_default_volumes: trove_conductor_default_volumes: - "{{ node_config_directory }}/trove-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' }}" - "{{ kolla_dev_repos_directory ~ '/trove:/dev-mode/trove' if trove_dev_mode | bool else '' }}" @@ -155,7 +153,6 @@ trove_conductor_default_volumes: trove_taskmanager_default_volumes: - "{{ node_config_directory }}/trove-taskmanager/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/trove:/dev-mode/trove' if trove_dev_mode | bool else '' }}" diff --git a/ansible/roles/valkey/defaults/main.yml b/ansible/roles/valkey/defaults/main.yml index 46647abd7..e7870a1b3 100644 --- a/ansible/roles/valkey/defaults/main.yml +++ b/ansible/roles/valkey/defaults/main.yml @@ -62,13 +62,11 @@ valkey_sentinel_healthcheck: valkey_default_volumes: - "{{ node_config_directory }}/valkey-server/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}" - "{{ project_name }}:/var/lib/valkey/" - "kolla_logs:/var/log/kolla/" valkey_sentinel_default_volumes: - "{{ node_config_directory }}/valkey-sentinel/:{{ 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/" valkey_extra_volumes: "{{ default_extra_volumes }}" diff --git a/ansible/roles/watcher/defaults/main.yml b/ansible/roles/watcher/defaults/main.yml index 9be499cc2..d22e5ad99 100644 --- a/ansible/roles/watcher/defaults/main.yml +++ b/ansible/roles/watcher/defaults/main.yml @@ -137,21 +137,18 @@ watcher_engine_healthcheck: watcher_api_default_volumes: - "{{ node_config_directory }}/watcher-api/:{{ 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 ~ '/watcher:/dev-mode/watcher' if watcher_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" watcher_applier_default_volumes: - "{{ node_config_directory }}/watcher-applier/:{{ 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 ~ '/watcher:/dev-mode/watcher' if watcher_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" watcher_engine_default_volumes: - "{{ node_config_directory }}/watcher-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 ~ '/watcher:/dev-mode/watcher' if watcher_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml index c418f88b0..2550cf940 100644 --- a/ansible/roles/zun/defaults/main.yml +++ b/ansible/roles/zun/defaults/main.yml @@ -177,21 +177,18 @@ zun_cni_daemon_healthcheck: zun_api_default_volumes: - "{{ node_config_directory }}/zun-api/:{{ 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 ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" zun_wsproxy_default_volumes: - "{{ node_config_directory }}/zun-wsproxy/:{{ 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 ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}" - "kolla_logs:/var/log/kolla/" - "{{ '/dev/shm:/dev/shm' }}" zun_compute_default_volumes: - "{{ node_config_directory }}/zun-compute/:{{ 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/" - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}" - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}" @@ -204,7 +201,6 @@ zun_compute_default_volumes: zun_cni_daemon_default_volumes: - "{{ node_config_directory }}/zun-cni-daemon/:{{ 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' }}" - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}" diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 8925a2c02..b2ce35427 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -14,7 +14,7 @@ Kolla Ansible supports the following host Operating Systems (OS): Linux 10 images instead. * CentOS Stream 10 -* Debian Bookworm (12) +* Debian Trixie (13) * Rocky Linux 10 * Ubuntu Noble (24.04) diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 295df62e6..d143e4ae7 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -12,60 +12,60 @@ label: centos-10-stream-arm64-8GB - nodeset: - name: kolla-ansible-debian-bookworm-8GB + name: kolla-ansible-debian-trixie-8GB nodes: - name: primary - label: debian-bookworm-8GB + label: debian-trixie-8GB - nodeset: - name: kolla-ansible-debian-bookworm-16GB + name: kolla-ansible-debian-trixie-16GB nodes: - name: primary - label: debian-bookworm-16GB + label: debian-trixie-16GB - nodeset: - name: kolla-ansible-debian-bookworm-aarch64-8GB + name: kolla-ansible-debian-trixie-aarch64-8GB nodes: - name: primary - label: debian-bookworm-arm64-8GB + label: debian-trixie-arm64-8GB - nodeset: - name: kolla-ansible-debian-bookworm-masakari-8GB + name: kolla-ansible-debian-trixie-masakari-8GB nodes: - name: primary - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: secondary - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: ternary1 - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: ternary2 - label: debian-bookworm-8GB + label: debian-trixie-8GB - nodeset: - name: kolla-ansible-debian-bookworm-multi-8GB + name: kolla-ansible-debian-trixie-multi-8GB nodes: - name: primary - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: secondary1 - label: debian-bookworm-8GB + label: debian-trixie-8GB - name: secondary2 - label: debian-bookworm-8GB + label: debian-trixie-8GB - nodeset: - name: kolla-ansible-debian-bookworm-multi-16GB + name: kolla-ansible-debian-trixie-multi-16GB nodes: - name: primary - label: debian-bookworm-16GB + label: debian-trixie-16GB - name: secondary1 - label: debian-bookworm-16GB + label: debian-trixie-16GB - name: secondary2 - label: debian-bookworm-16GB + label: debian-trixie-16GB - nodeset: - name: kolla-ansible-debian-bookworm-nested-virt + name: kolla-ansible-debian-trixie-nested-virt nodes: - name: primary - label: debian-bookworm-nested-virt-8GB + label: debian-trixie-nested-virt-8GB - nodeset: name: kolla-ansible-rocky-10-8GB diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index cb292e522..8057b9594 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -26,23 +26,23 @@ nodeset: kolla-ansible-centos-10s-aarch64-8GB - job: - name: kolla-ansible-debian-bookworm + name: kolla-ansible-debian-trixie parent: kolla-ansible-aio-base - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: - name: kolla-ansible-debian-bookworm-aarch64 - parent: kolla-ansible-debian-bookworm - nodeset: kolla-ansible-debian-bookworm-aarch64-8GB + name: kolla-ansible-debian-trixie-aarch64 + parent: kolla-ansible-debian-trixie + nodeset: kolla-ansible-debian-trixie-aarch64-8GB timeout: 10800 vars: kolla_build_images: true voting: false - job: - name: kolla-ansible-debian-bookworm-aarch64-podman - parent: kolla-ansible-debian-bookworm-aarch64 - nodeset: kolla-ansible-debian-bookworm-aarch64-8GB + name: kolla-ansible-debian-trixie-aarch64-podman + parent: kolla-ansible-debian-trixie-aarch64 + nodeset: kolla-ansible-debian-trixie-aarch64-8GB timeout: 10800 vars: container_engine: podman @@ -50,9 +50,9 @@ voting: false - job: - name: kolla-ansible-debian-bookworm-podman - parent: kolla-ansible-debian-bookworm - nodeset: kolla-ansible-debian-bookworm-16GB + name: kolla-ansible-debian-trixie-podman + parent: kolla-ansible-debian-trixie + nodeset: kolla-ansible-debian-trixie-16GB vars: container_engine: podman @@ -123,8 +123,8 @@ check: jobs: - kolla-ansible-centos-10s - - kolla-ansible-debian-bookworm - - kolla-ansible-debian-bookworm-podman + - kolla-ansible-debian-trixie + - kolla-ansible-debian-trixie-podman - kolla-ansible-debian-bookworm-upgrade - kolla-ansible-rocky-10 - kolla-ansible-rocky-10-upgrade @@ -135,14 +135,14 @@ check-arm64: jobs: - kolla-ansible-centos-10s-aarch64 - - kolla-ansible-debian-bookworm-aarch64 - - kolla-ansible-debian-bookworm-aarch64-podman + - kolla-ansible-debian-trixie-aarch64 + - kolla-ansible-debian-trixie-aarch64-podman - kolla-ansible-debian-bookworm-aarch64-upgrade gate: jobs: - - kolla-ansible-debian-bookworm - - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade + - kolla-ansible-debian-trixie + - kolla-ansible-debian-trixie-podman - kolla-ansible-rocky-10 - kolla-ansible-rocky-10-upgrade - kolla-ansible-rocky-10-podman diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml index 958c5a69c..c2d01aaed 100644 --- a/zuul.d/scenarios/bifrost.yaml +++ b/zuul.d/scenarios/bifrost.yaml @@ -13,9 +13,9 @@ - ^bifrost - job: - name: kolla-ansible-debian-bookworm-bifrost + name: kolla-ansible-debian-trixie-bifrost parent: kolla-ansible-bifrost-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-bifrost @@ -33,6 +33,6 @@ Runs Kolla-Ansible Bifrost scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-bifrost + - kolla-ansible-debian-trixie-bifrost - kolla-ansible-rocky-10-bifrost - kolla-ansible-ubuntu-noble-bifrost diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml index b94bbe93a..97897b45f 100644 --- a/zuul.d/scenarios/cells.yaml +++ b/zuul.d/scenarios/cells.yaml @@ -15,9 +15,9 @@ - ^proxysql - job: - name: kolla-ansible-debian-bookworm-cells + name: kolla-ansible-debian-trixie-cells parent: kolla-ansible-cells-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-rocky-10-cells @@ -35,6 +35,6 @@ Runs Kolla-Ansible Nova Cells scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-cells + - kolla-ansible-debian-trixie-cells - kolla-ansible-rocky-10-cells - kolla-ansible-ubuntu-noble-cells diff --git a/zuul.d/scenarios/cephadm.yaml b/zuul.d/scenarios/cephadm.yaml index 115589a79..55d0698c9 100644 --- a/zuul.d/scenarios/cephadm.yaml +++ b/zuul.d/scenarios/cephadm.yaml @@ -19,22 +19,12 @@ - ^valkey - job: - name: kolla-ansible-debian-bookworm-cephadm + name: kolla-ansible-debian-trixie-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB timeout: 10800 - -- job: - name: kolla-ansible-debian-bookworm-cephadm-upgrade - parent: kolla-ansible-debian-bookworm-cephadm - nodeset: kolla-ansible-debian-bookworm-multi-16GB - timeout: 10800 - -- job: - name: kolla-ansible-debian-bookworm-cephadm-upgrade-slurp - parent: kolla-ansible-debian-bookworm-cephadm-upgrade - nodeset: kolla-ansible-debian-bookworm-multi-16GB - timeout: 9000 + vars: + cephadm_use_package_from_distribution: true - job: name: kolla-ansible-rocky-10-cephadm @@ -76,8 +66,8 @@ Runs Kolla-Ansible CephAdm scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-cephadm - kolla-ansible-debian-bookworm-cephadm-upgrade + - kolla-ansible-debian-trixie-cephadm - kolla-ansible-rocky-10-cephadm - kolla-ansible-rocky-10-cephadm-upgrade - kolla-ansible-ubuntu-noble-cephadm diff --git a/zuul.d/scenarios/container-engine-migration.yaml b/zuul.d/scenarios/container-engine-migration.yaml index c57aaa23a..31bf4c1ec 100644 --- a/zuul.d/scenarios/container-engine-migration.yaml +++ b/zuul.d/scenarios/container-engine-migration.yaml @@ -13,12 +13,12 @@ - job: name: kolla-ansible-debian-container-engine-migration parent: kolla-ansible-container-engine-migration-base - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: name: kolla-ansible-debian-container-engine-migration-multinode parent: kolla-ansible-container-engine-migration-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-ubuntu-container-engine-migration diff --git a/zuul.d/scenarios/haproxy-fqdn.yaml b/zuul.d/scenarios/haproxy-fqdn.yaml index 51ecfcdc0..7a32335e8 100644 --- a/zuul.d/scenarios/haproxy-fqdn.yaml +++ b/zuul.d/scenarios/haproxy-fqdn.yaml @@ -15,9 +15,9 @@ scenario: haproxy - job: - name: kolla-ansible-debian-bookworm-haproxy-fqdn + name: kolla-ansible-debian-trixie-haproxy-fqdn parent: kolla-ansible-haproxy-fqdn-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-haproxy-fqdn @@ -35,6 +35,6 @@ Runs Kolla-Ansible HAProxy FQDN scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-haproxy-fqdn + - kolla-ansible-debian-trixie-haproxy-fqdn - kolla-ansible-rocky-10-haproxy-fqdn - kolla-ansible-ubuntu-noble-haproxy-fqdn diff --git a/zuul.d/scenarios/ipv6.yaml b/zuul.d/scenarios/ipv6.yaml index f465b966a..582d6484f 100644 --- a/zuul.d/scenarios/ipv6.yaml +++ b/zuul.d/scenarios/ipv6.yaml @@ -19,9 +19,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-ipv6 + name: kolla-ansible-debian-trixie-ipv6 parent: kolla-ansible-ipv6-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: name: kolla-ansible-rocky-10-ipv6 @@ -39,6 +39,6 @@ Runs Kolla-Ansible ipv6 scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-ipv6 + - kolla-ansible-debian-trixie-ipv6 - kolla-ansible-rocky-10-ipv6 - kolla-ansible-ubuntu-noble-ipv6 diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml index 6f468cc95..9cc37d53b 100644 --- a/zuul.d/scenarios/ironic.yaml +++ b/zuul.d/scenarios/ironic.yaml @@ -23,14 +23,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-ironic + name: kolla-ansible-debian-trixie-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-debian-bookworm-16GB - -- job: - name: kolla-ansible-debian-bookworm-ironic-upgrade - parent: kolla-ansible-debian-bookworm-ironic - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: name: kolla-ansible-rocky-10-ironic @@ -58,8 +53,8 @@ Runs Kolla-Ansible Ironic scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-ironic - kolla-ansible-debian-bookworm-ironic-upgrade + - kolla-ansible-debian-trixie-ironic - kolla-ansible-rocky-10-ironic - kolla-ansible-rocky-10-ironic-upgrade - kolla-ansible-ubuntu-noble-ironic diff --git a/zuul.d/scenarios/keystone-federation.yaml b/zuul.d/scenarios/keystone-federation.yaml index 47e3f3ff8..2f43e15ef 100644 --- a/zuul.d/scenarios/keystone-federation.yaml +++ b/zuul.d/scenarios/keystone-federation.yaml @@ -12,9 +12,9 @@ - ^httpd - job: - name: kolla-ansible-debian-bookworm-federation + name: kolla-ansible-debian-trixie-federation parent: kolla-ansible-federation-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: name: kolla-ansible-rocky-10-federation @@ -32,6 +32,6 @@ Runs Kolla-Ansible Keystone federation scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-federation + - kolla-ansible-debian-trixie-federation - kolla-ansible-rocky-10-federation - kolla-ansible-ubuntu-noble-federation diff --git a/zuul.d/scenarios/kvm.yaml b/zuul.d/scenarios/kvm.yaml index ed7d3219c..c83683eae 100644 --- a/zuul.d/scenarios/kvm.yaml +++ b/zuul.d/scenarios/kvm.yaml @@ -10,9 +10,9 @@ virt_type: kvm - job: - name: kolla-ansible-debian-bookworm-kvm + name: kolla-ansible-debian-trixie-kvm parent: kolla-ansible-kvm-base - nodeset: kolla-ansible-debian-bookworm-nested-virt + nodeset: kolla-ansible-debian-trixie-nested-virt - job: name: kolla-ansible-rocky-10-kvm @@ -30,6 +30,6 @@ Runs Kolla-Ansible KVM scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-kvm + - kolla-ansible-debian-trixie-kvm - kolla-ansible-rocky-10-kvm - kolla-ansible-ubuntu-noble-kvm diff --git a/zuul.d/scenarios/lets-encrypt.yaml b/zuul.d/scenarios/lets-encrypt.yaml index fc059a79c..92fa2b78d 100644 --- a/zuul.d/scenarios/lets-encrypt.yaml +++ b/zuul.d/scenarios/lets-encrypt.yaml @@ -19,9 +19,9 @@ le_enabled: true - job: - name: kolla-ansible-debian-bookworm-lets-encrypt + name: kolla-ansible-debian-trixie-lets-encrypt parent: kolla-ansible-lets-encrypt-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-ubuntu-noble-lets-encrypt @@ -34,5 +34,5 @@ Runs Kolla-Ansible Let's Encrypt scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-lets-encrypt + - kolla-ansible-debian-trixie-lets-encrypt - kolla-ansible-ubuntu-noble-lets-encrypt diff --git a/zuul.d/scenarios/magnum.yaml b/zuul.d/scenarios/magnum.yaml index 9a5552150..d3a031973 100644 --- a/zuul.d/scenarios/magnum.yaml +++ b/zuul.d/scenarios/magnum.yaml @@ -18,9 +18,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-magnum + name: kolla-ansible-debian-trixie-magnum parent: kolla-ansible-magnum-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-magnum @@ -38,6 +38,6 @@ Runs Kolla-Ansible Magnum scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-magnum + - kolla-ansible-debian-trixie-magnum - kolla-ansible-rocky-10-magnum - kolla-ansible-ubuntu-noble-magnum diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml index 8ce92f6e6..d82bddaf4 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -19,9 +19,9 @@ - ^proxysql - job: - name: kolla-ansible-debian-bookworm-mariadb + name: kolla-ansible-debian-trixie-mariadb parent: kolla-ansible-mariadb-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB - job: name: kolla-ansible-debian-bookworm-mariadb-upgrade @@ -54,7 +54,7 @@ Runs Kolla-Ansible MariaDB scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-mariadb + - kolla-ansible-debian-trixie-mariadb - kolla-ansible-debian-bookworm-mariadb-upgrade - kolla-ansible-rocky-10-mariadb - kolla-ansible-rocky-10-mariadb-upgrade @@ -62,7 +62,7 @@ - kolla-ansible-ubuntu-noble-mariadb-upgrade gate: jobs: - - kolla-ansible-debian-bookworm-mariadb + - kolla-ansible-debian-trixie-mariadb - kolla-ansible-debian-bookworm-mariadb-upgrade - kolla-ansible-rocky-10-mariadb - kolla-ansible-rocky-10-mariadb-upgrade diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index 02eb2a98e..1a1169d22 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -17,9 +17,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-masakari + name: kolla-ansible-debian-trixie-masakari parent: kolla-ansible-masakari-base - nodeset: kolla-ansible-debian-bookworm-masakari-8GB + nodeset: kolla-ansible-debian-trixie-masakari-8GB - job: name: kolla-ansible-rocky-10-masakari @@ -37,6 +37,6 @@ Runs Kolla-Ansible Masakari scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-masakari + - kolla-ansible-debian-trixie-masakari - kolla-ansible-rocky-10-masakari - kolla-ansible-ubuntu-noble-masakari diff --git a/zuul.d/scenarios/nfv.yaml b/zuul.d/scenarios/nfv.yaml index 03df813c0..f5594a427 100644 --- a/zuul.d/scenarios/nfv.yaml +++ b/zuul.d/scenarios/nfv.yaml @@ -18,9 +18,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-nfv + name: kolla-ansible-debian-trixie-nfv parent: kolla-ansible-scenario-nfv-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: name: kolla-ansible-ubuntu-noble-nfv @@ -33,5 +33,5 @@ Runs Kolla-Ansible NFV scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-nfv + - kolla-ansible-debian-trixie-nfv - kolla-ansible-ubuntu-noble-nfv diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml index 520969f65..5625e63cf 100644 --- a/zuul.d/scenarios/octavia.yaml +++ b/zuul.d/scenarios/octavia.yaml @@ -15,9 +15,9 @@ tls_enabled: false - job: - name: kolla-ansible-debian-bookworm-octavia + name: kolla-ansible-debian-trixie-octavia parent: kolla-ansible-octavia-base - nodeset: kolla-ansible-debian-bookworm-16GB + nodeset: kolla-ansible-debian-trixie-16GB - job: name: kolla-ansible-ubuntu-noble-octavia @@ -30,5 +30,5 @@ Runs Kolla-Ansible Octavia scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-octavia + - kolla-ansible-debian-trixie-octavia - kolla-ansible-ubuntu-noble-octavia diff --git a/zuul.d/scenarios/openbao.yaml b/zuul.d/scenarios/openbao.yaml index 1cca53ec3..c7ef9659b 100644 --- a/zuul.d/scenarios/openbao.yaml +++ b/zuul.d/scenarios/openbao.yaml @@ -15,9 +15,9 @@ - ^tests/test-openbao-passwords.sh - job: - name: kolla-ansible-debian-bookworm-openbao + name: kolla-ansible-debian-trixie-openbao parent: kolla-ansible-openbao-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-openbao @@ -35,6 +35,6 @@ Runs Kolla-Ansible OpenBao scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-openbao + - kolla-ansible-debian-trixie-openbao - kolla-ansible-rocky-10-openbao - kolla-ansible-ubuntu-noble-openbao diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml index b9a6b1be2..618c6b524 100644 --- a/zuul.d/scenarios/ovn.yaml +++ b/zuul.d/scenarios/ovn.yaml @@ -14,9 +14,9 @@ - ^ovn - job: - name: kolla-ansible-debian-bookworm-ovn + name: kolla-ansible-debian-trixie-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-debian-bookworm-multi-16GB + nodeset: kolla-ansible-debian-trixie-multi-16GB # NOTE(mnasiadka): Often cirros boot is crashing on cannot open root device voting: false @@ -54,7 +54,7 @@ Runs Kolla-Ansible OVN scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-ovn + - kolla-ansible-debian-trixie-ovn - kolla-ansible-debian-bookworm-ovn-upgrade - kolla-ansible-rocky-10-ovn - kolla-ansible-rocky-10-ovn-upgrade diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml index 66ded1aeb..fb8c6c445 100644 --- a/zuul.d/scenarios/prometheus-opensearch.yaml +++ b/zuul.d/scenarios/prometheus-opensearch.yaml @@ -24,14 +24,9 @@ - ^rabbitmq - job: - name: kolla-ansible-debian-bookworm-prometheus-opensearch + name: kolla-ansible-debian-trixie-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base - nodeset: kolla-ansible-debian-bookworm-8GB - -- job: - name: kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade - parent: kolla-ansible-debian-bookworm-prometheus-opensearch - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-prometheus-opensearch @@ -59,8 +54,8 @@ Runs Kolla-Ansible Prometheus OpenSearch scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-prometheus-opensearch - kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade + - kolla-ansible-debian-trixie-prometheus-opensearch - kolla-ansible-rocky-10-prometheus-opensearch - kolla-ansible-rocky-10-prometheus-opensearch-upgrade - kolla-ansible-ubuntu-noble-prometheus-opensearch diff --git a/zuul.d/scenarios/skyline.yaml b/zuul.d/scenarios/skyline.yaml index 5ff97810b..e3c0c4c79 100644 --- a/zuul.d/scenarios/skyline.yaml +++ b/zuul.d/scenarios/skyline.yaml @@ -21,14 +21,14 @@ scenario: skyline-sso - job: - name: kolla-ansible-debian-bookworm-skyline + name: kolla-ansible-debian-trixie-skyline parent: kolla-ansible-skyline-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: - name: kolla-ansible-debian-bookworm-skyline-sso + name: kolla-ansible-debian-trixie-skyline-sso parent: kolla-ansible-skyline-sso-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-skyline @@ -56,8 +56,8 @@ Runs Kolla-Ansible Skyline scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-skyline - - kolla-ansible-debian-bookworm-skyline-sso + - kolla-ansible-debian-trixie-skyline + - kolla-ansible-debian-trixie-skyline-sso - kolla-ansible-rocky-10-skyline - kolla-ansible-rocky-10-skyline-sso - kolla-ansible-ubuntu-noble-skyline diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml index bd762ea4c..878966b52 100644 --- a/zuul.d/scenarios/telemetry.yaml +++ b/zuul.d/scenarios/telemetry.yaml @@ -16,9 +16,9 @@ - ^valkey - job: - name: kolla-ansible-debian-bookworm-telemetry + name: kolla-ansible-debian-trixie-telemetry parent: kolla-ansible-telemetry-base - nodeset: kolla-ansible-debian-bookworm-8GB + nodeset: kolla-ansible-debian-trixie-8GB - job: name: kolla-ansible-rocky-10-telemetry @@ -36,6 +36,6 @@ Runs Kolla-Ansible Telemetry scenario jobs. check: jobs: - - kolla-ansible-debian-bookworm-telemetry + - kolla-ansible-debian-trixie-telemetry - kolla-ansible-rocky-10-telemetry - kolla-ansible-ubuntu-noble-telemetry diff --git a/zuul.d/scenarios/zun.yaml b/zuul.d/scenarios/zun.yaml index 25397725d..ea5e96a52 100644 --- a/zuul.d/scenarios/zun.yaml +++ b/zuul.d/scenarios/zun.yaml @@ -23,12 +23,12 @@ - ^tgtd - job: - name: kolla-ansible-debian-zun + name: kolla-ansible-debian-trixie-zun parent: kolla-ansible-zun-base - nodeset: kolla-ansible-debian-bookworm-multi-8GB + nodeset: kolla-ansible-debian-trixie-multi-8GB - job: - name: kolla-ansible-ubuntu-zun + name: kolla-ansible-ubuntu-noble-zun parent: kolla-ansible-zun-base nodeset: kolla-ansible-ubuntu-noble-multi-8GB @@ -38,5 +38,5 @@ Runs Kolla-Ansible Zun scenario jobs. check: jobs: - - kolla-ansible-debian-zun - - kolla-ansible-ubuntu-zun + - kolla-ansible-debian-trixie-zun + - kolla-ansible-ubuntu-noble-zun |