Skip to content

[18.0-fr5] Add missing Swift container images to EDPM dataplane ansible vars #1891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 15, 2026
Merged

[18.0-fr5] Add missing Swift container images to EDPM dataplane ansible vars #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions api/dataplane/v1beta1/openstackdataplanenodeset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
EdpmPodmanExporterImage: getStrPtr("quay.io/navidys/prometheus-podman-exporter:v1.10.1"),
OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"),
OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
SwiftAccountImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-account:current-podified"),
SwiftContainerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-container:current-podified"),
SwiftObjectImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-object:current-podified"),
SwiftProxyImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-proxy-server:current-podified"),
}}

// ContainerImages - the values if no OpenStackVersion is used
Expand Down Expand Up @@ -269,6 +273,10 @@ func SetupDefaults() {
NovaComputeImage: getImageDefault("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.NovaComputeImage),
OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage),
OsContainerImage: getImageDefault("RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OsContainerImage),
SwiftAccountImage: getImageDefault("RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT", ContainerImageDefaults.SwiftAccountImage),
SwiftContainerImage: getImageDefault("RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.SwiftContainerImage),
SwiftObjectImage: getImageDefault("RELATED_IMAGE_SWIFT_OBJECT_IMAGE_URL_DEFAULT", ContainerImageDefaults.SwiftObjectImage),
SwiftProxyImage: getImageDefault("RELATED_IMAGE_SWIFT_PROXY_IMAGE_URL_DEFAULT", ContainerImageDefaults.SwiftProxyImage),
},
}
}
Expand Down
12 changes: 12 additions & 0 deletions internal/dataplane/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,18 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.
if template.Ansible.AnsibleVars["edpm_ovn_bgp_agent_image"] == nil {
group.Vars["edpm_ovn_bgp_agent_image"] = containerImages.EdpmOvnBgpAgentImage
}
if template.Ansible.AnsibleVars["edpm_swift_account_image"] == nil {
group.Vars["edpm_swift_account_image"] = containerImages.SwiftAccountImage
}
if template.Ansible.AnsibleVars["edpm_swift_container_image"] == nil {
group.Vars["edpm_swift_container_image"] = containerImages.SwiftContainerImage
}
if template.Ansible.AnsibleVars["edpm_swift_object_image"] == nil {
group.Vars["edpm_swift_object_image"] = containerImages.SwiftObjectImage
}
if template.Ansible.AnsibleVars["edpm_swift_proxy_image"] == nil {
group.Vars["edpm_swift_proxy_image"] = containerImages.SwiftProxyImage
}
if template.Ansible.AnsibleVars["edpm_telemetry_ceilometer_compute_image"] == nil {
group.Vars["edpm_telemetry_ceilometer_compute_image"] = containerImages.CeilometerComputeImage
}
Expand Down
8 changes: 8 additions & 0 deletions internal/dataplane/util/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
containerImages.OsContainerImage = version.Status.ContainerImages.OsContainerImage
containerImages.AgentImage = version.Status.ContainerImages.AgentImage
containerImages.ApacheImage = version.Status.ContainerImages.ApacheImage
containerImages.SwiftAccountImage = version.Status.ContainerImages.SwiftAccountImage
containerImages.SwiftContainerImage = version.Status.ContainerImages.SwiftContainerImage
containerImages.SwiftObjectImage = version.Status.ContainerImages.SwiftObjectImage
containerImages.SwiftProxyImage = version.Status.ContainerImages.SwiftProxyImage
} else {
containerImages.AnsibleeeImage = dataplanev1.ContainerImages.AnsibleeeImage
containerImages.CeilometerComputeImage = dataplanev1.ContainerImages.CeilometerComputeImage
Expand All @@ -103,6 +107,10 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
containerImages.OsContainerImage = dataplanev1.ContainerImages.OsContainerImage
containerImages.AgentImage = dataplanev1.ContainerImages.AgentImage
containerImages.ApacheImage = dataplanev1.ContainerImages.ApacheImage
containerImages.SwiftAccountImage = dataplanev1.ContainerImages.SwiftAccountImage
containerImages.SwiftContainerImage = dataplanev1.ContainerImages.SwiftContainerImage
containerImages.SwiftObjectImage = dataplanev1.ContainerImages.SwiftObjectImage
containerImages.SwiftProxyImage = dataplanev1.ContainerImages.SwiftProxyImage

}

Expand Down
4 changes: 4 additions & 0 deletions test/functional/dataplane/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ var DefaultEdpmServiceAnsibleVarList = []string{
"edpm_nova_compute_image",
"edpm_ovn_controller_agent_image",
"edpm_ovn_bgp_agent_image",
"edpm_swift_account_image",
"edpm_swift_container_image",
"edpm_swift_object_image",
"edpm_swift_proxy_image",
}

var CustomEdpmServiceDomainTag = "test-image:latest"
Expand Down
4 changes: 4 additions & 0 deletions test/functional/dataplane/openstackdataplanenodeset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ var _ = Describe("Dataplane NodeSet Test", func() {
"edpm_nova_compute_image",
"edpm_ovn_controller_agent_image",
"edpm_ovn_bgp_agent_image",
"edpm_swift_account_image",
"edpm_swift_container_image",
"edpm_swift_object_image",
"edpm_swift_proxy_image",
}

BeforeEach(func() {
Expand Down
Loading