feat: add support for Ubuntu 24.04

ricolin · ricolin · commit 2c4173091d79 · 2026-06-16T17:52:50.000+08:00
Signed-off-by: Rico Lin &lt;rlin@vexxhost.com&gt;

Assisted-By: Codex &lt;noreply@openai.com&gt;
Change-Id: I3c4741c992e48e650c7711b89f5806f045ecc5f9
diff --git a/galaxy.yml b/galaxy.yml
@@ -8,7 +8,7 @@ description: Simple & easy private cloud platform featuring VMs, Kubernetes & ba
 license:
   - GPL-3.0-or-later
 dependencies:
-  ansible.netcommon: 1.2.0
+  ansible.netcommon: 8.5.0
   ansible.posix: 1.6.0
   ansible.utils: ">=2.9.0"
   community.crypto: 2.2.3
diff --git a/molecule/aio/prepare.yml b/molecule/aio/prepare.yml
@@ -22,7 +22,7 @@
         state: present
 
     - name: Purge "snapd" package
-      when: ansible_distribution | lower == 'ubuntu'
+      when: ansible_facts['distribution'] | lower == 'ubuntu'
       ansible.builtin.apt:
         name: snapd
         state: absent
@@ -32,7 +32,7 @@
   ansible.builtin.import_playbook: vexxhost.atmosphere.generate_workspace
   vars:
     workspace_path: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}"
-    domain_name: "{{ ansible_default_ipv4['address'].replace('.', '-') }}.nip.io"
+    domain_name: "{{ ansible_facts['default_ipv4']['address'].replace('.', '-') }}.nip.io"
 
 - name: Setup networking
   hosts: all
diff --git a/molecule/default/group_vars/all/molecule.yml b/molecule/default/group_vars/all/molecule.yml
@@ -10,6 +10,8 @@ glance_images:
     container_format: bare
     is_public: true
 
+magnum_images: "{{ _magnum_images[-1:] }}"
+
 atmosphere_network_backend: "{{ lookup('env', 'ATMOSPHERE_NETWORK_BACKEND') | default('openvswitch', True) }}"
 ovn_helm_values:
   conf:
diff --git a/plugins/filter/storage.py b/plugins/filter/storage.py
@@ -557,9 +557,28 @@ class StorageConfig(_StrictBase):
     )
 
 
+def _deep_unwrap(obj: Any) -> Any:
+    """Recursively unwrap Ansible lazy templating wrappers into plain types."""
+    cls_name = obj.__class__.__name__
+    if cls_name == "_LazyValue":
+        for attr in ("_value", "value"):
+            if hasattr(obj, attr):
+                obj = getattr(obj, attr)
+                break
+        cls_name = obj.__class__.__name__
+
+    if isinstance(obj, dict) or cls_name == "_AnsibleLazyTemplateDict":
+        return {_deep_unwrap(k): _deep_unwrap(v) for k, v in obj.items()}
+    if isinstance(obj, list) or cls_name == "_AnsibleLazyTemplateList":
+        return [_deep_unwrap(x) for x in obj]
+
+    return obj
+
+
 def _parse(raw: Any) -> StorageConfig:
     """Validate and parse raw Ansible input into a StorageConfig."""
-    return StorageConfig.model_validate(raw)
+    return StorageConfig.model_validate(_deep_unwrap(raw))
+
 
 
 def storage_to_cinder_helm_values(raw: Any) -> HelmValues:
diff --git a/releasenotes/notes/ubuntu-2404-support-5db257c24f87b616.yaml b/releasenotes/notes/ubuntu-2404-support-5db257c24f87b616.yaml
@@ -0,0 +1,15 @@
+---
+features:
+  - |
+    Added support for Ubuntu 24.04-based Atmosphere deployments.
+fixes:
+  - |
+    Updated Molecule preparation, Magnum image selection, and Kubernetes
+    resource rendering for compatibility with current Ansible versions.
+  - |
+    Fixed Open vSwitch deployments where the virtual IP init container could
+    wait forever for an IPv4 address on ``br-ex`` before the role assigned the
+    managed address.
+  - |
+    Wait for Neutron network availability zones before provisioning configured
+    networks.
diff --git a/roles/ibm_block_csi_driver/tasks/main.yml b/roles/ibm_block_csi_driver/tasks/main.yml
@@ -3,9 +3,11 @@
 - name: Deploy CSI
   kubernetes.core.k8s:
     state: present
-    template:
-      - path: ibm-block-csi-operator.yaml.j2
-      - path: csi.ibm.com_v1_ibmblockcsi_cr.yaml.j2
+    definition: >-
+      {{
+        (lookup('ansible.builtin.template', 'ibm-block-csi-operator.yaml.j2') | from_yaml_all | list)
+        + (lookup('ansible.builtin.template', 'csi.ibm.com_v1_ibmblockcsi_cr.yaml.j2') | from_yaml_all | list)
+      }}
 
 - name: Create Secret
   kubernetes.core.k8s:
diff --git a/roles/ingress/tasks/main.yml b/roles/ingress/tasks/main.yml
@@ -16,4 +16,4 @@
   run_once: true
   kubernetes.core.k8s:
     state: present
-    template: ingress.yml.j2
+    definition: "{{ lookup('ansible.builtin.template', 'ingress.yml.j2') | from_yaml }}"
diff --git a/roles/keepalived/tasks/main.yml b/roles/keepalived/tasks/main.yml
@@ -57,9 +57,9 @@
             #!/bin/sh -x
 
             while true; do
-                ip -4 addr list dev {{ keepalived_interface }} | grep {{ keepalived_interface }}
+                ip link show dev {{ keepalived_interface }} >/dev/null 2>&1
 
-                # We detected an IP address
+                # We detected the interface that keepalived will manage.
                 if [ $? -eq 0 ]; then
                     break
                 fi
diff --git a/roles/keystone/tasks/main.yml b/roles/keystone/tasks/main.yml
@@ -66,7 +66,7 @@
 - name: Create ConfigMap with all OpenID connect configurations
   run_once: true
   kubernetes.core.k8s:
-    template: configmap-openid-metadata.yml.j2
+    definition: "{{ lookup('ansible.builtin.template', 'configmap-openid-metadata.yml.j2') | from_yaml }}"
 
 - name: Create Keycloak clients
   no_log: true
diff --git a/roles/kube_prometheus_stack/tasks/main.yml b/roles/kube_prometheus_stack/tasks/main.yml
@@ -306,7 +306,7 @@
   run_once: true
   kubernetes.core.k8s:
     state: "{{ item.state }}"
-    template: configmap-dashboard.yaml.j2
+    definition: "{{ lookup('ansible.builtin.template', 'configmap-dashboard.yaml.j2') | from_yaml }}"
   loop:
     - name: haproxy
       state: present
diff --git a/roles/neutron/defaults/main.yml b/roles/neutron/defaults/main.yml
@@ -23,6 +23,10 @@ neutron_helm_values: {}
 # List of networks to provision inside OpenStack
 neutron_networks: []
 
+# List of network availability zones required before provisioning networks.
+neutron_network_availability_zones:
+  - nova
+
 # Class name to use for the Ingress
 neutron_ingress_class_name: "{{ atmosphere_ingress_class_name }}"
 
diff --git a/roles/neutron/tasks/main.yml b/roles/neutron/tasks/main.yml
@@ -92,6 +92,23 @@
           type: Available
           status: true
 
+    - name: Wait until network availability zones are ready
+      ansible.builtin.command:
+        cmd: >-
+          {{ ansible_playbook_python }} -c
+          'import openstack;
+          conn = openstack.connect(cloud="atmosphere");
+          print("\n".join(zone.name for zone in conn.network.availability_zones()))'
+      changed_when: false
+      register: _neutron_network_availability_zones
+      retries: 60
+      delay: 5
+      until: >-
+        neutron_network_availability_zones |
+        difference(_neutron_network_availability_zones.stdout_lines) |
+        length == 0
+      when: neutron_network_availability_zones | length > 0
+
     - name: Create networks
       openstack.cloud.network:
         cloud: atmosphere
diff --git a/roles/openstack_helm_endpoints/tasks/main.yml b/roles/openstack_helm_endpoints/tasks/main.yml
@@ -15,7 +15,7 @@
 - name: Retrieve list of all the needed endpoints
   ansible.builtin.set_fact:
     openstack_helm_endpoints_list: |-
-      {{ lookup('ansible.builtin.file', '../../../charts/' ~ openstack_helm_endpoints_chart ~ '/values.yaml', split_lines=False) | from_yaml | community.general.json_query('keys(endpoints)') | difference(_openstack_helm_endpoints_ignore) }}
+      {{ (lookup('ansible.builtin.file', '../../../charts/' ~ openstack_helm_endpoints_chart ~ '/values.yaml', split_lines=False) | from_yaml).endpoints.keys() | list | difference(_openstack_helm_endpoints_ignore) }}
   when:
     - openstack_helm_endpoints_chart is defined
 
diff --git a/roles/portworx/tasks/main.yml b/roles/portworx/tasks/main.yml
@@ -47,9 +47,11 @@
   run_once: true
   kubernetes.core.k8s:
     state: present
-    template:
-      - portworx.yml
-      - config.yml
+    definition: >-
+      {{
+        (lookup('ansible.builtin.template', 'portworx.yml') | from_yaml_all | list)
+        + (lookup('ansible.builtin.template', 'config.yml') | from_yaml_all | list)
+      }}
 
 - name: Wait till the CRDs are created
   run_once: true
@@ -68,6 +70,8 @@
   run_once: true
   kubernetes.core.k8s:
     state: present
-    template:
-      - storage_cluster.yml
-      - storage_class.yml
+    definition: >-
+      {{
+        (lookup('ansible.builtin.template', 'storage_cluster.yml') | from_yaml_all | list)
+        + (lookup('ansible.builtin.template', 'storage_class.yml') | from_yaml_all | list)
+      }}
diff --git a/tests/unit/plugins/filter/test_storage.py b/tests/unit/plugins/filter/test_storage.py
@@ -91,6 +91,27 @@
 }
 
 
+class _LazyValue:
+    def __init__(self, value):
+        self._value = value
+
+
+class _AnsibleLazyTemplateDict(dict):
+    pass
+
+
+def _lazy_storage(raw):
+    if isinstance(raw, dict):
+        return _AnsibleLazyTemplateDict(
+            {_lazy_storage(key): _lazy_storage(value) for key, value in raw.items()}
+        )
+    if isinstance(raw, list):
+        return [_lazy_storage(value) for value in raw]
+    if isinstance(raw, str):
+        return _LazyValue(raw)
+    return raw
+
+
 class TestValidation:
     def test_empty_storage_is_valid(self):
         cfg = StorageConfig.model_validate({})
@@ -1019,6 +1040,12 @@ def test_no_ec_backends(self):
         result = storage_to_ceph_provisioners_helm_values(DEFAULT_STORAGE)
         assert result == {}
 
+    def test_ansible_lazy_values_are_unwrapped(self):
+        result = storage_to_ceph_provisioners_helm_values(
+            _lazy_storage(DEFAULT_STORAGE)
+        )
+        assert result == {}
+
     def test_no_volumes_config(self):
         result = storage_to_ceph_provisioners_helm_values({})
         assert result == {}
