Skip to content

Commit 8f69868

Browse files
katarimanojkclaude
katarimanojk
and
claude
committed
Cleanup EdpmMultipathdImage container references
multipathd service has been moved from container to host in edpm-ansible. Clean up the related EdpmMultipathdImage container references following the same pattern as EdpmIscsidImage cleanup: - Mark EdpmMultipathdImage field as deprecated in API types with appropriate comments - Remove edpm_multipathd_image from inventory variable assignments - Comment out RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT in build configuration - Remove edpm_multipathd_image from documentation examples - Remove EdpmMultipathdImage test assertions - Remove edpmMultipathdImage field documentation The API fields are preserved but marked as deprecated to maintain backward compatibility. All usage of the field has been removed from the codebase. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent b9613ec commit 8f69868

11 files changed

Lines changed: 18 additions & 21 deletions

File tree

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ type ContainerTemplate struct {
107107
DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"`
108108
EdpmFrrImage *string `json:"edpmFrrImage,omitempty"`
109109
EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"`
110-
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
110+
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
111+
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
111112
EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"`
112113
EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"`
113114
EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"`

‎api/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,10 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
233233
EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"),
234234
EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"),
235235
EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"),
236-
EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"),
237-
EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"),
238-
NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"),
236+
EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"),
237+
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
238+
EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"),
239+
NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"),
239240
OvnControllerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"),
240241
EdpmOvnBgpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"),
241242
CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"),
@@ -265,7 +266,8 @@ func SetupDefaults() {
265266
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
266267
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
267268
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
268-
EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage),
269+
EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage),
270+
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
269271
EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage),
270272
EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage),
271273
EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage),

‎config/operator/default_images.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ spec:
7777
value: quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
7878
- name: RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT
7979
value: quay.io/podified-antelope-centos9/openstack-cron:current-podified
80-
- name: RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT
81-
value: quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
80+
# Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
81+
# - name: RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT
82+
# value: quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
8283
- name: RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT
8384
value: quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified
8485
- name: RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT

‎docs/assemblies/common_configurations.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ ifeval::["{build}" != "downstream"]
9494
edpm_telemetry_ceilometer_ipmi_image: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi
9595
edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute
9696
edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent
97-
edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd
9897
edpm_neutron_dhcp_image: "quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent
9998
edpm_neutron_metadata_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn
10099
edpm_neutron_ovn_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent
@@ -119,7 +118,6 @@ ifeval::["{build}" == "downstream"]
119118
edpm_telemetry_ceilometer_ipmi_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-ipmi-rhel9:18.0.0
120119
edpm_nova_compute_image: "redhat.registry.io/rhoso-beta/openstack-nova-compute-rhel9:18.0.0
121120
edpm_neutron_sriov_image: "redhat.registry.io/rhoso-beta/openstack-neutron-sriov-agent-rhel9:18.0.0
122-
edpm_multipathd_image: "redhat.registry.io/rhoso-beta/openstack-multipathd-rhel9:18.0.0
123121
edpm_neutron_dhcp_image: "redhat.registry.io/rhoso-beta/openstack-neutron-dhcp-agent-rhel9:18.0.0
124122
edpm_neutron_metadata_agent_image: "redhat.registry.io/rhoso-beta/openstack-neutron-metadata-agent-ovn-rhel9:18.0.0
125123
edpm_neutron_ovn_agent_image: "redhat.registry.io/rhoso-beta/openstack-neutron-ovn-agent-rhel9:18.0.0

‎docs/assemblies/ctlplane_resources.adoc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,11 +2043,6 @@ ContainerTemplate - struct that contains container image URLs for each service i
20432043
| *string
20442044
| false
20452045
2046-
| edpmMultipathdImage
2047-
|
2048-
| *string
2049-
| false
2050-
20512046
| edpmNeutronDhcpAgentImage
20522047
|
20532048
| *string

‎docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ ifeval::["{build}" != "downstream"]
291291
edpm_libvirt_image: "quay.io/podified-antelope-centos9/openstack-nova-libvirt:current-podified"
292292
edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
293293
edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
294-
edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"
295294
endif::[]
296295
ifeval::["{build}" == "downstream"]
297296
edpm_iscsid_image: "registry.redhat.io/rhosp-dev-preview/openstack-iscsid:18.0"
@@ -305,7 +304,6 @@ ifeval::["{build}" == "downstream"]
305304
edpm_libvirt_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-libvirt:18.0"
306305
edpm_nova_compute_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-compute:18.0"
307306
edpm_neutron_sriov_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-sriov-agent:18.0"
308-
edpm_multipathd_image: "registry.redhat.io/rhosp-dev-preview/openstack-multipathd:18.0"
309307
endif::[]
310308
----
311309

‎hack/export_related_images.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podifi
7878
export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-frr:current-podified
7979
export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
8080
export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified
81-
export RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
81+
# Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
82+
# export RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
8283
export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified
8384
export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified
8485
export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified

‎internal/dataplane/inventory.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,7 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.
335335
if template.Ansible.AnsibleVars["edpm_logrotate_crond_image"] == nil {
336336
group.Vars["edpm_logrotate_crond_image"] = containerImages.EdpmLogrotateCrondImage
337337
}
338-
if template.Ansible.AnsibleVars["edpm_multipathd_image"] == nil {
339-
group.Vars["edpm_multipathd_image"] = containerImages.EdpmMultipathdImage
340-
}
338+
// edpm_multipathd_image is no longer used - multipathd now runs on the host instead of in a container
341339
if template.Ansible.AnsibleVars["edpm_neutron_dhcp_image"] == nil {
342340
group.Vars["edpm_neutron_dhcp_image"] = containerImages.EdpmNeutronDhcpAgentImage
343341
}

‎internal/dataplane/util/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
6666
containerImages.EdpmFrrImage = version.Status.ContainerImages.EdpmFrrImage
6767
containerImages.EdpmIscsidImage = version.Status.ContainerImages.EdpmIscsidImage
6868
containerImages.EdpmLogrotateCrondImage = version.Status.ContainerImages.EdpmLogrotateCrondImage
69+
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
6970
containerImages.EdpmMultipathdImage = version.Status.ContainerImages.EdpmMultipathdImage
7071
containerImages.EdpmNeutronDhcpAgentImage = version.Status.ContainerImages.EdpmNeutronDhcpAgentImage
7172
containerImages.EdpmNeutronMetadataAgentImage = version.Status.ContainerImages.EdpmNeutronMetadataAgentImage
@@ -92,6 +93,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
9293
containerImages.EdpmFrrImage = dataplanev1.ContainerImages.EdpmFrrImage
9394
containerImages.EdpmIscsidImage = dataplanev1.ContainerImages.EdpmIscsidImage
9495
containerImages.EdpmLogrotateCrondImage = dataplanev1.ContainerImages.EdpmLogrotateCrondImage
96+
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
9597
containerImages.EdpmMultipathdImage = dataplanev1.ContainerImages.EdpmMultipathdImage
9698
containerImages.EdpmNeutronDhcpAgentImage = dataplanev1.ContainerImages.EdpmNeutronDhcpAgentImage
9799
containerImages.EdpmNeutronMetadataAgentImage = dataplanev1.ContainerImages.EdpmNeutronMetadataAgentImage

‎internal/openstack/version.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
145145
EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage),
146146
EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage),
147147
EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage),
148+
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
148149
EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage),
149150
EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage),
150151
EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage),

0 commit comments

Comments
 (0)