Skip to content

Update template and vars for ffu and minor update jobs#585

Merged
olliewalsh merged 2 commits into
openstack-k8s-operators:masterfrom
stuggi:stage_ffu
Nov 13, 2025
Merged

Update template and vars for ffu and minor update jobs#585
olliewalsh merged 2 commits into
openstack-k8s-operators:masterfrom
stuggi:stage_ffu

Conversation

@stuggi

@stuggi stuggi commented Oct 29, 2025

Copy link
Copy Markdown
Contributor

Updates containers-prepare-parameters template for the new registry, also updates var files for ffu and older releases
where images are located on the old registry.

@stuggi stuggi changed the title Update template and vars Update template and vars for ffu jobs Oct 29, 2025
@stuggi

stuggi commented Oct 29, 2025

Copy link
Copy Markdown
Contributor Author

testing ffu with this. minor update tests to follow. will follow up with another PR.

@abays

abays commented Oct 30, 2025

Copy link
Copy Markdown
Contributor

This seems fine to me structurally. Not sure if I can judge the value changes though.

@stuggi stuggi added the DO NOT MERGE Work-in-progress label Oct 31, 2025
@stuggi stuggi force-pushed the stage_ffu branch 6 times, most recently from 824a5f6 to 6f99f50 Compare November 5, 2025 15:00
@stuggi stuggi changed the title Update template and vars for ffu jobs Update template and vars for ffu and minor update jobs Nov 5, 2025
…ication

This update enables support for the new container registry structure while
maintaining compatibility with older releases, and ensures registry
authentication works correctly during minor update workflows.

Key changes:

Container registry migration:
- Added date-based logic to handle old vs new registry structure in 17.1:
  * Before 20251006: uses old registry (rh-osbs namespace, rhosp17-openstack- prefix)
  * After 20251006: uses new registry (rhosp-rhel9 namespace, openstack prefix)
- Updated 16.2 and 17.0 templates to support new registry structure
- Added podman-baremetal-ansible.yaml configuration files for 16.2 and
  17.1 to make sure to perform registry login on update.

Auto-detection of registry from container metadata:
- removes the region based registry_proxy, since the new registry does
  not have geo mirrors.
- Modified auto_dict.yaml to extract registry_proxy from downloaded
  container_image_prepare.yaml namespace instead of using ansible variable
- Use regex_findall instead of regex_search to prevent NoneType errors
- Simplified quote stripping to use trim("'") filter
- Ensure name_prefix always ends with a dash for consistency

Registry authentication improvements:
- Changed authentication logic to login to ALL registries for which
  credentials were provided (not just registry_proxy match)

Variable file cleanup:
- Removed redundant registry_proxy definitions from 17.1 var files
  (now auto-detected from container metadata)
- Consolidated fencing var files for 16.2 releases
- Added 17.1.3_fencing.yaml for new release
- Updated FFU and older release vars to point to old registry

Jira: OSPRH-21317

Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
Comment thread ansible/vars/default.yaml
Comment thread ansible/vars/default.yaml

@olliewalsh olliewalsh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@olliewalsh olliewalsh merged commit 10c7b03 into openstack-k8s-operators:master Nov 13, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants