Merge pull request #889 from stackhpc/upstream/master-2026-06-22

Synchronise master with upstream

Author: priteau

ansible/group_vars/all/cinder.yml

@@ -10,6 +10,7 @@ enable_cinder_backend_pure_fc: false
 enable_cinder_backend_pure_roce: false
 enable_cinder_backend_pure_nvme_tcp: false
 enable_cinder_backend_lightbits: false
+enable_cinder_backend_vast: false
 
 #################################
 # Cinder options

ansible/group_vars/all/ovn.yml

@@ -8,7 +8,7 @@ ovn_sb_db_port: "6642"
 ovn_sb_db_relay_count: "{{ ((groups['ovn-controller'] | length) / ovn_sb_db_relay_compute_per_relay | int) | round(0, 'ceil') | int }}"
 ovn_sb_db_relay_compute_per_relay: "50"
 ovn_sb_db_relay_port_prefix: "1664"
-ovn_sb_db_relay_port: "{{ ovn_sb_db_relay_port_prefix ~ ovn_sb_db_relay_client_group_id }}"
+ovn_sb_db_relay_port: "{{ (ovn_sb_db_relay_port_prefix | int) * 10 + (ovn_sb_db_relay_client_group_id | int) }}"
 ovn_sb_db_relay_client_group_id: "{{ range(1, ovn_sb_db_relay_count | int + 1) | random(seed=inventory_hostname) }}"
 ovn_nb_connection:
   "{% for host in groups['ovn-nb-db'] %}\

ansible/module_utils/kolla_podman_worker.py

@@ -13,6 +13,7 @@
 from podman.errors import APIError
 from podman import PodmanClient
 
+import os
 import shlex
 
 from ansible.module_utils.kolla_container_worker import COMPARE_CONFIG_CMD
@@ -591,6 +592,7 @@ def build_ulimits(self, ulimits):
     def create_container(self):
         # ensure volumes are pre-created before container creation
         self.create_container_volumes()
+        self.create_missing_bind_directories()
 
         args = self.prepare_container_args()
         container = self.pc.containers.create(**args)
@@ -740,6 +742,19 @@ def create_container_volumes(self):
 
             self.create_volume(name=volume_name)
 
+    def create_missing_bind_directories(self):
+        volumes = self.params.get('volumes')
+        if not volumes:
+            return
+        for volume in volumes:
+            if not volume or not volume.strip():
+                continue
+            if volume[0] != '/':
+                continue
+            src = volume.split(':')[0]
+            if not os.path.exists(src):
+                os.makedirs(src, exist_ok=True)
+
     def remove_volume(self):
         if self.check_volume():
             self.changed = True

ansible/roles/cinder/defaults/main.yml

@@ -270,6 +270,8 @@ cinder_backends:
     enabled: "{{ enable_cinder_backend_pure_nvme_tcp | bool }}"
   - name: "{{ cinder_backend_lightbits_name }}"
     enabled: "{{ enable_cinder_backend_lightbits | bool }}"
+  - name: "{{ cinder_backend_vast_name }}"
+    enabled: "{{ enable_cinder_backend_vast | bool }}"
 
 cinder_backend_ceph_name: "rbd-1"
 cinder_backend_lvm_name: "lvm-1"
@@ -280,6 +282,7 @@ cinder_backend_pure_fc_name: "Pure-FlashArray-fc"
 cinder_backend_pure_roce_name: "Pure-FlashArray-roce"
 cinder_backend_pure_nvme_tcp_name: "Pure-FlashArray-nvme-tcp"
 cinder_backend_lightbits_name: "Lightbits-NVMe-TCP"
+cinder_backend_vast_name: "vast-nvme-tcp"
 
 cinder_ceph_backends:
   - name: "{{ cinder_backend_ceph_name }}"
@@ -339,6 +342,12 @@ lightos_default_num_replicas: 3
 lightos_api_address:
 lightos_jwt:
 
+################################
+# Cinder VAST Storage Driver
+################################
+cinder_vast_username: admin
+cinder_vast_port: 443
+
 ################################
 # Cinder Backup S3
 ################################

ansible/roles/cinder/tasks/precheck.yml

@@ -43,6 +43,7 @@
     - not enable_cinder_backend_pure_roce | bool
     - not enable_cinder_backend_pure_nvme_tcp | bool
     - not enable_cinder_backend_lightbits | bool
+    - not enable_cinder_backend_vast | bool
 
 - name: Checking LVM volume group exists for Cinder
   become: true
@@ -88,6 +89,18 @@
     - lightos_jwt
   when: enable_cinder_backend_lightbits == "yes"
 
+- name: Check if VAST configurations are defined
+  ansible.builtin.assert:
+    that:
+      - vars[item] is defined
+    msg: "Cinder VAST backend is enabled, the {{ item }} variable must be defined."
+  with_items:
+    - cinder_vast_ip
+    - cinder_vast_password
+    - cinder_vast_vippool_name
+    - cinder_vast_subsystem
+  when: enable_cinder_backend_vast | bool
+
 - name: Check if cinder_cluster_name is configured for HA configurations
   ansible.builtin.assert:
     that:

ansible/roles/cinder/templates/cinder.conf.j2

@@ -228,6 +228,18 @@ lightos_skip_ssl_verify = {{ lightbits_skip_ssl_verify | bool }}
 lightos_jwt = {{ lightbits_jwt }}
 {% endif %}
 
+{% if enable_cinder_backend_vast | bool %}
+[{{ cinder_backend_vast_name }}]
+volume_driver = cinder.volume.drivers.vastdata.driver.VASTVolumeDriver
+volume_backend_name = {{ cinder_backend_vast_name }}
+vast_vippool_name = {{ cinder_vast_vippool_name }}
+vast_subsystem = {{ cinder_vast_subsystem }}
+san_ip = {{ cinder_vast_ip }}
+san_api_port = {{ cinder_vast_port }}
+san_login = {{ cinder_vast_username }}
+san_password = {{ cinder_vast_password }}
+{% endif %}
+
 [privsep_entrypoint]
 helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --config-file /etc/cinder/cinder.conf
 

ansible/roles/glance/defaults/main.yml

@@ -7,7 +7,7 @@ glance_services:
     enabled: true
     image: "{{ glance_api_image_full }}"
     environment: "{{ glance_api_container_proxy }}"
-    privileged: "{{ enable_cinder | bool and (enable_cinder_backend_iscsi | bool or cinder_backend_ceph | bool) }}"
+    privileged: "{{ glance_api_privileged | bool }}"
     volumes: "{{ glance_api_default_volumes + glance_api_extra_volumes }}"
     dimensions: "{{ glance_api_dimensions }}"
     healthcheck: "{{ glance_api_healthcheck }}"
@@ -181,9 +181,8 @@ glance_api_default_volumes:
   - "{{ kolla_dev_repos_directory ~ '/glance:/dev-mode/glance' if glance_dev_mode | bool else '' }}"
   - "kolla_logs:/var/log/kolla/"
   - "{{ '/dev/shm:/dev/shm' }}"
-  # NOTE(yoctozepto): below to support Cinder iSCSI backends
   - "{% if enable_cinder | bool and enable_cinder_backend_iscsi | bool %}iscsi_info:/etc/iscsi{% endif %}"
-  - "{% if enable_cinder | bool and enable_cinder_backend_iscsi | bool %}/dev:/dev{% endif %}"
+  - "{% if glance_api_privileged | bool %}/dev:/dev{% endif %}"
 
 glance_extra_volumes: "{{ default_extra_volumes }}"
 glance_api_extra_volumes: "{{ glance_extra_volumes }}"
@@ -240,6 +239,12 @@ glance_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
 glance_dev_mode: "{{ kolla_dev_mode }}"
 glance_source_version: "{{ kolla_source_version }}"
 
+# iSCSI and VAST NVME-over-TCP need access to the real /dev fs.
+glance_api_privileged: "{{ (enable_cinder | bool) and
+    (enable_cinder_backend_iscsi | bool or
+    cinder_backend_ceph | bool or
+    enable_cinder_backend_vast | bool) }}"
+
 ###################
 # Glance cache
 ###################

ansible/roles/horizon/templates/_9998-kolla-settings.py.j2

@@ -1,5 +1,4 @@
 DEBUG = {{ horizon_logging_debug }}
-TEMPLATE_DEBUG = DEBUG
 COMPRESS_OFFLINE = True
 WEBROOT = '/'
 ALLOWED_HOSTS = ['*']
@@ -138,9 +137,6 @@ OPENSTACK_NEUTRON_NETWORK = {
     'enable_ipv6': True,
     'enable_distributed_router': False,
     'enable_ha_router': False,
-    'enable_lb': True,
-    'enable_firewall': True,
-    'enable_vpn': True,
     'enable_fip_topology_check': True,
     'supported_vnic_types': ['*'],
 }

ansible/roles/ironic/templates/ironic-conductor.json.j2

@@ -36,5 +36,12 @@
             "owner": "ironic:ironic",
             "recurse": true
         }{% endif %}
+    ],
+    "directories": [
+        {
+            "path": "/var/lib/ironic/tmp",
+            "owner": "ironic:ironic",
+            "perm": "0700"
+        }
     ]
 }

ansible/roles/ironic/templates/ironic.conf.j2

@@ -4,6 +4,8 @@ auth_strategy = noauth
 {% endif %}
 debug = {{ ironic_logging_debug }}
 
+tempdir = /var/lib/ironic/tmp
+
 log_file = /var/log/kolla/ironic/{{ service_name }}.log
 
 transport_url = {{ rpc_transport_url }}