Merge branch 'main' into extra-var-files-pre-metal

Author: srac0

docs/dictionary/en-custom.txt

@@ -18,6 +18,7 @@ IdP
 Idempotency
 LDAP
 LLM
+LVs
 MachineConfig
 Marjanovic
 MiB
@@ -236,6 +237,7 @@ fips
 firewalld
 flbxutz
 fmw
+frontend
 fqdn
 freefonts
 frmo

hooks/playbooks/ceph.yml

@@ -104,6 +104,10 @@
   gather_facts: false
   become: true
   tasks:
+    - name: Gather network facts for IP-to-host mapping
+      ansible.builtin.setup:
+        gather_subset:
+          - network
     # jq is normally installed by cifmw_block_device role, but when cifmw_ceph_spec_data_devices
     # is defined (indicating block devices are already present), the block device creation play
     # is skipped. Install jq explicitly here to ensure it's available for ceph operations.
@@ -159,6 +163,9 @@
             hostvars[_target]['ansible_ssh_private_key_file'] |
             default(lookup('env', 'ANSIBLE_SSH_PRIVATE_KEY'))
           }}
+        cifmw_block_device_thin_pool: "{{ cifmw_ceph_thin_pool | default('') }}"
+        cifmw_block_device_thin_lv_size: "{{ cifmw_ceph_thin_lv_size | default('50G') }}"
+        cifmw_block_device_thin_lv_name: "ceph_osd_{{ i }}"
         cifmw_block_device_image_file: /var/lib/ceph-osd-{{ i }}.img
         cifmw_block_device_loop: /dev/loop{{ i + 3 }}
         cifmw_block_lv_name: ceph_lv{{ i }}
@@ -170,6 +177,17 @@
         loop_var: i
       loop: "{{ range(0, cifmw_num_osds_perhost|int) }}"
 
+    - name: Build data_devices for ceph spec from cifmw_block_device outputs
+      ansible.builtin.set_fact:
+        cifmw_ceph_spec_data_devices: |
+          data_devices:
+            paths:
+          {% for p in cifmw_block_device_paths %}
+              - {{ p }}
+          {% endfor %}
+      delegate_to: localhost
+      delegate_facts: true
+
 - name: Build Ceph spec and conf from gathered IPs of the target inventory group
   tags: spec
   hosts: localhost
@@ -186,9 +204,12 @@
       when:
         - not cifmw_ceph_ipv6 | default(false)
       ansible.builtin.set_fact:
-        ssh_network_range: 192.168.122.0/24
-        # storage_network_range: 172.18.0.0/24
-        storage_mgmt_network_range: 172.20.0.0/24
+        ssh_network_range: >-
+          {{ cifmw_ceph_ssh_network_range | default('192.168.122.0/24') }}
+        storage_network_range: >-
+          {{ cifmw_ceph_storage_network_range | default('172.18.0.0/24') }}
+        storage_mgmt_network_range: >-
+          {{ cifmw_ceph_storage_mgmt_network_range | default('172.20.0.0/24') }}
         all_addresses: ansible_all_ipv4_addresses
         ms_bind_ipv4: true
         ms_bind_ipv6: false

roles/ci_gen_kustomize_values/templates/nova05epsilon/edpm-nodeset-values-post-ceph/values.yaml.j2

@@ -0,0 +1,23 @@
+---
+# source: nova05epsilon/edpm-nodeset-values-post-ceph/values.yaml.j2
+# Auto-populates ceph_conf from files written by ceph.yml hook.
+# The ceph.yml post_stage_run hook (via cifmw_ceph_client role) writes
+# Ceph config files to cifmw_ceph_client_fetch_dir (default /tmp/).
+# This template reads those files and provides them as base64-encoded
+# values under data.ceph_conf (DCN convention).
+# When running in generate-CRs-only mode (mock validation), the files
+# won't exist; emit placeholders so kustomize can still build.
+{% set _fetch_dir = cifmw_ceph_client_fetch_dir | default('/tmp') %}
+{% set _cluster = cifmw_ceph_client_cluster | default('ceph') %}
+{% set _conf_file = (_fetch_dir, _cluster ~ '.conf') | path_join %}
+{% set _keyring_file = (_fetch_dir, _cluster ~ '.client.openstack.keyring') | path_join %}
+{% set _mock = cifmw_kustomize_deploy_generate_crs_only | default(false) | bool %}
+data:
+  ceph_conf:
+{% if not _mock and _keyring_file is file and _conf_file is file %}
+    {{ _cluster }}.client.openstack.keyring: {{ lookup('file', _keyring_file, rstrip=False) | b64encode }}
+    {{ _cluster }}.conf: {{ lookup('file', _conf_file, rstrip=False) | b64encode }}
+{% else %}
+    {{ _cluster }}.client.openstack.keyring: CHANGEME_CEPH_KEYRING
+    {{ _cluster }}.conf: CHANGEME_CEPH_CONF
+{% endif %}

roles/cifmw_backup_restore/tasks/e2e.yml

@@ -78,9 +78,34 @@
 # ========================================
 # Step 2.5: Upload Swift test data
 # ========================================
-- name: Upload Swift test data before backup
-  ansible.builtin.include_tasks: swift_data_upload.yml
+- name: Detect Swift and upload test data
   when: cifmw_backup_restore_test_swift_data | bool
+  block:
+    - name: Check if Swift is enabled in the control plane
+      ansible.builtin.shell: |
+        set -o pipefail
+        oc get openstackcontrolplane -n {{ cifmw_backup_restore_namespace }} \
+          -o jsonpath='{.items[0].spec.swift.enabled}'
+      register: _swift_enabled_result
+      changed_when: false
+      failed_when: false
+
+    - name: Set Swift availability fact
+      ansible.builtin.set_fact:
+        _cifmw_backup_restore_swift_available: >-
+          {{ (_swift_enabled_result.rc == 0) and
+             (_swift_enabled_result.stdout | default('false') | bool) }}
+
+    - name: Skip Swift tests — Swift is not enabled
+      ansible.builtin.debug:
+        msg: >-
+          Swift is not enabled in the OpenStackControlPlane CR.
+          Skipping Swift data upload/verify steps.
+      when: not (_cifmw_backup_restore_swift_available | bool)
+
+    - name: Upload Swift test data before backup
+      ansible.builtin.include_tasks: swift_data_upload.yml
+      when: _cifmw_backup_restore_swift_available | bool
 
 # ========================================
 # Step 3: Create backup
@@ -275,6 +300,7 @@
   ansible.builtin.include_tasks: swift_data_verify.yml
   when:
     - cifmw_backup_restore_test_swift_data | bool
+    - _cifmw_backup_restore_swift_available | default(false) | bool
     - cifmw_backup_restore_run_restore | bool
 
 # ========================================

roles/cifmw_backup_restore/templates/00-resource-modifiers-configmap.yaml.j2

@@ -11,8 +11,6 @@ data:
     resourceModifierRules:
     - conditions:
         groupResource: "*"
-        namespaces:
-        - {{ cifmw_backup_restore_namespace }}
       mergePatches:
       - patchData: |
           metadata:
@@ -21,8 +19,6 @@ data:
               kubectl.kubernetes.io/last-applied-configuration: null
     - conditions:
         groupResource: openstackcontrolplanes.core.openstack.org
-        namespaces:
-        - {{ cifmw_backup_restore_namespace }}
       mergePatches:
       - patchData: |
           metadata:
@@ -31,8 +27,6 @@ data:
               core.openstack.org/deployment-stage: "infrastructure-only"
     - conditions:
         groupResource: instancehas.instanceha.openstack.org
-        namespaces:
-        - {{ cifmw_backup_restore_namespace }}
       mergePatches:
       - patchData: |
           spec:

roles/cifmw_backup_restore/templates/backup-pvcs.yaml.j2

@@ -27,8 +27,6 @@ spec:
   hooks:
     resources:
       - name: swift-xattr-backup
-        includedNamespaces:
-          - {{ cifmw_backup_restore_namespace }}
         labelSelector:
           matchLabels:
             component: swift-storage

roles/cifmw_block_device/README.md

@@ -1,25 +1,31 @@
 # cifmw_block_device
 
-Creates a virtual block device with logical volumes. Useful for
-deploying Ceph on a virtual machine which does not have any
-block devices except for root. Creates a systemd unit so the
-virtual block device comes back online during reboot.
+Creates block devices with logical volumes for Ceph OSD testing.
+Supports two modes:
 
-The target system must have 7 GB of available disk space at minimum.
+- **Loop mode** (default): creates a loop-backed file with LVM on top
+  and a systemd unit to restore it across reboots. Useful for VMs
+  that have no spare block devices.
+- **Thin-pool mode**: creates thin-provisioned LVs from an existing
+  VG thin pool. Useful for bare-metal hosts that already have a
+  thin pool with available space.
 
-This role will recreate the block device on each run. Thus, if there
-is data on the block device from the previous run it will delete it.
-The assumption is that the block device exists for testing and that
-rebuilding the environment quickly is more important preserving any
-test data.
+The mode is selected by `cifmw_block_device_thin_pool`: when non-empty
+the role uses thin-pool mode, otherwise loop mode.
 
 ## Privilege escalation
 
-Requires root on the remote system to create loop back device and
-systemd unit.
+Requires root on the remote system to create devices and LVM objects.
 
 ## Parameters
 
+### Common
+
+* `cifmw_block_device_thin_pool`: VG/pool path for thin-pool mode,
+  e.g. `vg/lv_thinpool`. When empty (default), loop mode is used.
+
+### Loop mode
+
 * `cifmw_block_device_image_file`: Name of the `dd'd` image file
   (default `/var/lib/ceph-osd.img`)
 * `cifmw_block_device_size`: Size of the virtual block device (default
@@ -34,8 +40,25 @@ systemd unit.
   restores the device on system startup (default
   `/etc/systemd/system/ceph-osd-losetup.service`)
 
+### Thin-pool mode
+
+* `cifmw_block_device_thin_lv_size`: Size of each thin LV (default
+  `50G`)
+* `cifmw_block_device_thin_lv_name`: Name of the thin LV to create
+  (default `ceph_osd`)
+
+## Output
+
+Both modes append to the `cifmw_block_device_paths` list fact.
+Each role invocation adds one entry, so when called in a loop
+the list accumulates all created device paths (e.g.
+`["/dev/ceph_vg0/ceph_lv0", "/dev/ceph_vg1/ceph_lv1"]` or
+`["/dev/vg/ceph_osd_0", "/dev/vg/ceph_osd_1"]`).
+
 ## Examples
 
+### Loop mode (default)
+
 The following will create a 7 GB block device on the target system
 using the defaults above.
 ```
@@ -60,11 +83,30 @@ data_devices:
   paths:
   - /dev/ceph_vg/ceph_lv_data
 ```
-The following will stop and disable the systemd unit file which starts
-the virtual block device, remove the logical volume, volume group, and
-physical volume, and delete the loopback device and its backing file.
+
+### Thin-pool mode
+
+```yaml
+- include_role:
+    name: cifmw_block_device
+  vars:
+    cifmw_block_device_thin_pool: "vg/lv_thinpool"
+    cifmw_block_device_thin_lv_size: "50G"
+    cifmw_block_device_thin_lv_name: "ceph_osd_0"
+```
+Ceph spec entry:
+```yaml
+data_devices:
+  paths:
+  - /dev/vg/ceph_osd_0
 ```
+
+### Cleanup
+
+```yaml
 - import_role:
     name: cifmw_block_device
     tasks_from: cleanup
 ```
+For thin-pool mode, pass `cifmw_block_device_thin_pool` and
+`cifmw_block_device_thin_lv_name` so the correct cleanup path runs.

roles/cifmw_block_device/defaults/main.yml

@@ -18,9 +18,17 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_block_device"
 
+# --- Loop-device mode (default) ---
 cifmw_block_device_image_file: /var/lib/ceph-osd.img
 cifmw_block_device_size: 7G
 cifmw_block_device_loop: /dev/loop3
 cifmw_block_vg_name: ceph_vg
 cifmw_block_lv_name: ceph_lv_data
 cifmw_block_systemd_unit_file: /etc/systemd/system/ceph-osd-losetup.service
+
+# --- Thin-pool mode ---
+# When non-empty, create thin-provisioned LVs from this existing thin pool
+# instead of loop-backed files.  Value is "VG/pool", e.g. "vg/lv_thinpool".
+cifmw_block_device_thin_pool: ""
+cifmw_block_device_thin_lv_size: "50G"
+cifmw_block_device_thin_lv_name: "ceph_osd"

roles/cifmw_block_device/tasks/cleanup.yml

@@ -14,31 +14,47 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Ensure ceph-osd-losetup is not running and disabled
-  tags: systemd
+- name: Clean up thin-provisioned LV
+  when: cifmw_block_device_thin_pool | length > 0
   become: true
-  ansible.builtin.systemd:
-    state: stopped
-    enabled: false
-    name: "{{ cifmw_block_systemd_unit_file | basename }}"
+  ansible.builtin.command:
+    cmd: >-
+      lvremove --force
+      /dev/{{ cifmw_block_device_thin_pool.split('/')[0] }}/{{ cifmw_block_device_thin_lv_name }}
+  register: _thin_cleanup
+  failed_when:
+    - _thin_cleanup.rc != 0
+    - "'not found' not in (_thin_cleanup.stderr | default(''))"
 
-- name: Remove unit file
-  become: true
-  ansible.builtin.file:
-    path: "{{ cifmw_block_systemd_unit_file }}"
-    state: absent
+- name: Clean up loop-backed block device
+  when: cifmw_block_device_thin_pool | default('') | length == 0
+  block:
+    - name: Ensure ceph-osd-losetup is not running and disabled
+      tags: systemd
+      become: true
+      ansible.builtin.systemd:
+        state: stopped
+        enabled: false
+        name: "{{ cifmw_block_systemd_unit_file | basename }}"
 
-- name: Use {pv,vg,lv}remove to remove logical volume on loop device
-  become: true
-  ansible.builtin.shell:
-    cmd: |-
-      lvremove --force /dev/{{ cifmw_block_vg_name }}/{{ cifmw_block_lv_name }}
-      vgremove --force {{ cifmw_block_vg_name }}
-      pvremove --force {{ cifmw_block_device_loop }}
-      lvs
+    - name: Remove unit file
+      become: true
+      ansible.builtin.file:
+        path: "{{ cifmw_block_systemd_unit_file }}"
+        state: absent
+
+    - name: Use {pv,vg,lv}remove to remove logical volume on loop device
+      become: true
+      ansible.builtin.shell:
+        cmd: |-
+          lvremove --force /dev/{{ cifmw_block_vg_name }}/{{ cifmw_block_lv_name }}
+          vgremove --force {{ cifmw_block_vg_name }}
+          pvremove --force {{ cifmw_block_device_loop }}
+          lvs
 
-- name: Use losetup and rm to cremove the loop device and backing image file
+- name: Use losetup and rm to remove the loop device and backing image file
   become: true
+  when: cifmw_block_device_thin_pool | length > 0
   ansible.builtin.shell:
     cmd: |-
       losetup -d {{ cifmw_block_device_loop }}