Fdp update edpm

cleanup-edpm.yml

@@ -8,6 +8,11 @@
   hosts: localhost
   gather_facts: true
   tasks:
+    - name: Clean up hypervisor firewall rules
+      ansible.builtin.include_role:
+        name: fdp_update_edpm
+        tasks_from: cleanup_hypervisor_firewall.yml
+
     - name: Clean up all directories
       ansible.builtin.import_role:
         name: ci_setup

docs/dictionary/en-custom.txt

@@ -260,6 +260,7 @@ ipam
 ipi
 ipmi
 ips
+iptables
 ipv
 iscsi
 isdir
@@ -418,6 +419,7 @@ openstack
 openstackclient
 openstackcontrolplane
 openstackdataplane
+openstackdataplanedeployment
 openstackdataplanenodeset
 openstackdataplanenodesets
 openstackprovisioner

post-deployment.yml

@@ -9,23 +9,6 @@
       tags:
         - admin-setup
 
-    - name: Run Test
-      ansible.builtin.import_role:
-        name: cifmw_setup
-        tasks_from: run_tests.yml
-      tags:
-        - run-tests
-
-    - name: Run compliance scan for controllers
-      ansible.builtin.import_role:
-        name: compliance
-      vars:
-        cifmw_compliance_podman_username: "{{ cifmw_registry_token.credentials.username }}"
-        cifmw_compliance_podman_password: "{{ cifmw_registry_token.credentials.password }}"
-      when: cifmw_run_operators_compliance_scans | default(false) | bool
-      tags:
-        - compliance
-
     # FDP Update - OpenStack package updates across all layers
     - name: FDP Update - Validate required variables
       when: cifmw_fdp_update_enabled | default(false) | bool
@@ -54,6 +37,29 @@
             cifmw_fdp_update_container_images_target_package: "{{ cifmw_fdp_update_target_package }}"
             cifmw_fdp_update_container_images_repo_baseurl: "{{ cifmw_fdp_update_repo_baseurl }}"
 
+        - name: Update EDPM (containers and host packages)
+          ansible.builtin.import_role:
+            name: fdp_update_edpm
+          vars:
+            cifmw_fdp_update_edpm_repo_baseurl: "{{ cifmw_fdp_update_repo_baseurl }}"
+
+    - name: Run Test
+      ansible.builtin.import_role:
+        name: cifmw_setup
+        tasks_from: run_tests.yml
+      tags:
+        - run-tests
+
+    - name: Run compliance scan for controllers
+      ansible.builtin.import_role:
+        name: compliance
+      vars:
+        cifmw_compliance_podman_username: "{{ cifmw_registry_token.credentials.username }}"
+        cifmw_compliance_podman_password: "{{ cifmw_registry_token.credentials.password }}"
+      when: cifmw_run_operators_compliance_scans | default(false) | bool
+      tags:
+        - compliance
+
 - name: Run compliance scan for computes
   hosts: "{{ groups['computes'] | default ([]) }}"
   gather_facts: true

roles/fdp_update_container_images/tasks/process_image.yml

@@ -53,8 +53,7 @@
     namespace: "{{ cifmw_fdp_update_container_images_namespace }}"
     definition:
       spec:
-        customContainerImages:
-          "{{ image_entry.key }}": "{{ _cifmw_fdp_update_container_images_new_image_path_internal }}"
+        customContainerImages: "{{ { image_entry.key: _cifmw_fdp_update_container_images_new_image_path_internal } }}"
 
 - name: Update tracking
   ansible.builtin.set_fact:

roles/fdp_update_edpm/README.md

@@ -0,0 +1,185 @@
+# fdp_update_edpm
+
+Role for updating OpenStack EDPM (Edge Data Plane Management) nodes with custom container images and host packages.
+
+## Description
+
+This role provides a declarative approach to update EDPM nodes with:
+
+1. **Updates container images** by patching OpenStackDataPlaneNodeSet CRs with new image references
+2. **Updates host packages** by configuring `edpm_bootstrap_packages` and `edpm_bootstrap_repos` in the nodeset
+3. **Configures registry authentication** with OpenShift service account tokens
+4. **Installs CA certificates** for secure registry access
+5. **Optionally creates deployments** to apply the changes to EDPM nodes
+
+### Key Features
+
+- **Declarative approach**: Only modifies Kubernetes CRs, doesn't execute commands directly on EDPM nodes
+- **Uses native EDPM capabilities**: Leverages `edpm_bootstrap` and `edpm_podman` roles from edpm-ansible
+- **Secure by default**: Installs OpenShift CA certificates instead of using insecure registries
+- **Flexible**: Supports updating containers, packages, or both
+- **Idempotent**: Can be run multiple times safely
+
+## Requirements
+
+- OpenShift cluster with OpenStack operators installed
+- Access to `oc` command
+- OpenStackVersion CR with custom container images
+- Custom repository with updated packages (if updating host packages)
+
+## Role Variables
+
+### General Configuration
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `cifmw_fdp_update_edpm_namespace` | `"openstack"` | OpenShift namespace |
+| `cifmw_fdp_update_edpm_nodeset_name` | `"all"` | NodeSet to update (`"all"` or specific name) |
+| `cifmw_fdp_update_edpm_dry_run` | `false` | Show changes without applying |
+
+### Container Image Updates
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `cifmw_fdp_update_edpm_containers_enabled` | `true` | Enable container image updates |
+| `cifmw_fdp_update_edpm_image_registry` | `""` | External registry URL (auto-detected if empty) |
+| `cifmw_fdp_update_edpm_image_variable_mapping` | See defaults | Mapping of image keys to EDPM variables |
+
+### Host Package Updates
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `cifmw_fdp_update_edpm_packages_enabled` | `true` | Enable host package updates |
+| `cifmw_fdp_update_edpm_repo_baseurl` | `""` | **REQUIRED** Repository base URL |
+| `cifmw_fdp_update_edpm_repo_name` | `"fdp-update"` | Repository name |
+| `cifmw_fdp_update_edpm_packages` | See defaults | List of packages to install/update |
+
+### Hypervisor Firewall Configuration
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `cifmw_fdp_update_edpm_setup_hypervisor_firewall` | `true` | Enable/disable hypervisor firewall setup for registry access |
+| `cifmw_fdp_update_edpm_hypervisor_host` | `"hypervisor"` | Hostname or inventory name of the hypervisor where firewall rules will be configured via delegate_to |
+| `cifmw_fdp_update_compute_interface` | `"osp_trunk"` | Network interface on hypervisor connected to compute nodes (EDPM) |
+| `cifmw_fdp_update_registry_interface` | `"ocpbm"` | Network interface on hypervisor connected to OpenShift/registry |
+| `cifmw_fdp_update_compute_network` | `"192.168.122.0/24"` | Compute nodes network CIDR (source for NAT) |
+| `cifmw_fdp_update_registry_network` | `"192.168.201.0/24"` | OpenShift/registry network CIDR (destination for NAT) |
+
+### Registry Configuration
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `cifmw_fdp_update_edpm_configure_registry_ca` | `true` | Install OpenShift CA certificate via bootstrap command |
+| `cifmw_fdp_update_edpm_configure_registry_auth` | `true` | Configure registry authentication |
+
+### Deployment Configuration
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `cifmw_fdp_update_edpm_auto_deploy` | `true` | Automatically create deployment |
+| `cifmw_fdp_update_edpm_deployment_per_nodeset` | `true` | Create separate deployment per nodeset |
+| `cifmw_fdp_update_edpm_wait_for_deployment` | `true` | Wait for deployment to complete |
+| `cifmw_fdp_update_edpm_deployment_timeout` | `3600` | Deployment timeout (seconds) |
+| `cifmw_fdp_update_edpm_deployment_services` | See defaults | Services to run in deployment |
+
+## Dependencies
+
+None (uses native OpenStack Data Plane operators and edpm-ansible roles)
+
+## Example Playbook
+
+### Update both containers and packages
+
+```yaml
+- hosts: localhost
+  roles:
+    - role: fdp_update_edpm
+      vars:
+        cifmw_fdp_update_edpm_namespace: openstack
+        cifmw_fdp_update_edpm_nodeset_name: openstack-edpm
+        cifmw_fdp_update_edpm_repo_baseurl: "http://example.com/repos/fdp-updates"
+        cifmw_fdp_update_edpm_packages:
+          - openvswitch3.5
+          - openvswitch-selinux-extra-policy
+```
+
+### Update only containers
+
+```yaml
+- hosts: localhost
+  roles:
+    - role: fdp_update_edpm
+      vars:
+        cifmw_fdp_update_edpm_packages_enabled: false
+        cifmw_fdp_update_edpm_containers_enabled: true
+```
+
+### Update only packages
+
+```yaml
+- hosts: localhost
+  roles:
+    - role: fdp_update_edpm
+      vars:
+        cifmw_fdp_update_edpm_containers_enabled: false
+        cifmw_fdp_update_edpm_packages_enabled: true
+        cifmw_fdp_update_edpm_repo_baseurl: "http://example.com/repos/updates"
+```
+
+### Dry run (show changes without applying)
+
+```yaml
+- hosts: localhost
+  roles:
+    - role: fdp_update_edpm
+      vars:
+        cifmw_fdp_update_edpm_dry_run: true
+```
+
+### Custom network configuration
+
+```yaml
+- hosts: localhost
+  roles:
+    - role: fdp_update_edpm
+      vars:
+        cifmw_fdp_update_compute_interface: "br-ex"
+        cifmw_fdp_update_registry_interface: "br-ocp"
+        cifmw_fdp_update_compute_network: "10.0.0.0/24"
+        cifmw_fdp_update_registry_network: "172.16.0.0/24"
+```
+
+## How It Works
+
+1. **Validates parameters**: Ensures required variables are set
+2. **Configures hypervisor firewall** (if enabled): Sets up iptables rules to allow EDPM nodes to access the OpenShift registry
+3. **Fetches NodeSets**: Gets OpenStackDataPlaneNodeSet CRs from the cluster
+4. **Fetches container images** (if enabled): Gets custom images from OpenStackVersion CR
+5. **For each NodeSet**:
+   - Patches container image variables (e.g., `edpm_ovn_controller_agent_image`)
+   - Patches `edpm_bootstrap_packages` with packages to install
+   - Patches `edpm_bootstrap_repos` with custom repository configuration
+   - Configures registry authentication (`edpm_container_registry_logins`)
+   - Installs CA certificate via `edpm_bootstrap_command` (if enabled)
+6. **Creates deployment** (if enabled): Creates OpenStackDataPlaneDeployment CR
+7. **Waits for completion** (if enabled): Monitors deployment until Ready
+
+## Architecture: Declarative vs Imperative
+
+This role follows the **declarative** approach of Kubernetes/OpenStack:
+
+- [X] **Does NOT** SSH to nodes and run `dnf install` directly
+- [X] **Does NOT** SSH to nodes and run `systemctl restart` directly
+- [OK] **Does** patch NodeSet CRs with desired state
+- [OK] **Does** let OpenStack Data Plane Operator apply the changes
+- [OK] **Does** use native `edpm_bootstrap` role for package installation
+- [OK] **Does** use native `edpm_podman` role for container management
+- [OK] **Does** use `edpm_bootstrap_command` for CA certificate installation
+
+## License
+
+Apache 2.0
+
+## Author Information
+
+Red Hat OpenStack CI Framework Team

roles/fdp_update_edpm/defaults/main.yml

@@ -0,0 +1,111 @@
+---
+# Copyright Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# General Configuration
+# OpenShift namespace where EDPM resources are deployed
+cifmw_fdp_update_edpm_namespace: "openstack"
+
+# NodeSet selector - can be a specific name or 'all' for all nodesets
+cifmw_fdp_update_edpm_nodeset_name: "all"
+
+# Dry run - show changes without applying
+cifmw_fdp_update_edpm_dry_run: false
+
+# Container Image Updates
+# Enable/disable container image updates
+cifmw_fdp_update_edpm_containers_enabled: true
+
+# Image registry URL (auto-detected from OpenShift if empty)
+cifmw_fdp_update_edpm_image_registry: ""
+
+# Mapping of control plane image keys to EDPM ansible variables
+# Only ovnControllerImage is used on EDPM compute nodes
+cifmw_fdp_update_edpm_image_variable_mapping:
+  ovnControllerImage: edpm_ovn_controller_agent_image
+
+# Host Package Updates
+# Enable/disable host package updates
+cifmw_fdp_update_edpm_packages_enabled: true
+
+# Repository configuration for host package updates
+cifmw_fdp_update_edpm_repo_name: "fdp-update"
+cifmw_fdp_update_edpm_repo_baseurl: ""  # REQUIRED if packages_enabled is true
+cifmw_fdp_update_edpm_repo_enabled: true
+cifmw_fdp_update_edpm_repo_gpgcheck: false
+cifmw_fdp_update_edpm_repo_priority: 1
+
+# Packages to update on the host
+# These will be added to edpm_bootstrap_packages in the nodeset
+cifmw_fdp_update_edpm_packages:
+  - openvswitch3.5
+  - openvswitch-selinux-extra-policy
+
+# Hypervisor Firewall Configuration
+# Enable/disable hypervisor firewall setup for registry access
+cifmw_fdp_update_edpm_setup_hypervisor_firewall: true
+
+# Network interface on hypervisor connected to compute nodes (EDPM)
+cifmw_fdp_update_compute_interface: "osp_trunk"
+
+# Network interface on hypervisor connected to OpenShift/registry
+cifmw_fdp_update_registry_interface: "ocpbm"
+
+# Compute nodes network CIDR (source for NAT)
+cifmw_fdp_update_compute_network: "192.168.122.0/24"
+
+# OpenShift/registry network CIDR (destination for NAT)
+cifmw_fdp_update_registry_network: "192.168.201.0/24"
+
+# Registry Configuration
+# Configure OpenShift registry CA certificate on EDPM nodes
+cifmw_fdp_update_edpm_configure_registry_ca: true
+
+# Configure registry authentication automatically
+# Uses 'oc create token' or 'oc whoami -t' to get a service account token
+cifmw_fdp_update_edpm_configure_registry_auth: true
+
+# Deployment Configuration
+# Automatically create OpenStackDataPlaneDeployment after updating NodeSets
+# Creates a single deployment for all updated NodeSets
+cifmw_fdp_update_edpm_auto_deploy: true
+
+# Wait for deployment to complete before continuing
+cifmw_fdp_update_edpm_wait_for_deployment: true
+
+# Timeout for deployment completion (in seconds)
+# Default: 3600 seconds (60 minutes / 1 hour)
+cifmw_fdp_update_edpm_deployment_timeout: 3600
+
+# Polling interval when waiting for deployment (in seconds)
+cifmw_fdp_update_edpm_deployment_poll_interval: 30
+
+# Services to run in the deployment
+# For updates, we need to:
+# 1. bootstrap - Install host packages and configure repos
+# 2. configure-os - Configure registry authentication
+# 3. configure-network - Ensure network is configured
+# 4. Service-specific services (ovn, nova, etc) - Pull updated images and restart
+cifmw_fdp_update_edpm_deployment_services:
+  - bootstrap         # MUST be first to install packages and configure repos
+  - configure-os      # MUST be second to authenticate before pulling images
+  - configure-network
+  - ovn
+
+# Internal Variables (do not override)
+_cifmw_fdp_update_edpm_updated_images: {}
+_cifmw_fdp_update_edpm_nodesets: []
+_cifmw_fdp_update_edpm_updated_nodesets: []
+_cifmw_fdp_update_edpm_external_registry: ""