Skip to content

Commit 7bc9ac3

Browse files
katarimanojkclaude
katarimanojk
and
claude
committed
Remove edpm_iscsid_image container references
The iscsid service has been moved from container to host-based deployment in edpm-ansible (PR #984). This change removes or deprecates all references to EdpmIscsidImage throughout the codebase: - Removed from service containerImageFields (nova, run-os) - Removed from inventory variable assignment - Deprecated API fields with comments (preserves backward compatibility) - Updated sample configurations with deprecation notes - Removed from documentation - Commented out build-time image variables - Updated tests to remove EdpmIscsidImage assertions The EdpmIscsidImage field remains in the API types but is marked as deprecated to avoid breaking changes for existing deployments. Related: openstack-k8s-operators/edpm-ansible#984 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 2e0717b commit 7bc9ac3

17 files changed

Lines changed: 19 additions & 34 deletions

‎api/core/v1beta1/openstackversion_types.go‎

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

‎api/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,11 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
226226
ContainerTemplate: openstackv1.ContainerTemplate{
227227
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
228228
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
229-
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
230-
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
231-
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
232-
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
229+
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
230+
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
231+
// Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container.
232+
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
233+
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
233234
EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"),
234235
EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"),
235236
EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"),
@@ -262,13 +263,14 @@ func SetupDefaults() {
262263
ContainerImages = openstackv1.ContainerImages{
263264
ContainerTemplate: openstackv1.ContainerTemplate{
264265
AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage),
265-
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
266-
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
267-
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
268-
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
266+
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
267+
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
268+
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
269+
// Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container.
270+
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
269271
EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage),
270272
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
271-
EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage),
273+
EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage),
272274
EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage),
273275
EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage),
274276
EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage),

‎config/operator/default_images.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ spec:
7373
value: quay.io/podified-antelope-centos9/openstack-designate-worker:current-podified
7474
- name: RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT
7575
value: quay.io/podified-antelope-centos9/openstack-frr:current-podified
76-
- name: RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT
77-
value: quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
7876
- name: RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT
7977
value: quay.io/podified-antelope-centos9/openstack-cron:current-podified
8078
- name: RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT

‎config/samples/dataplane/post_ceph_hci/values.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ data:
1212
vars:
1313
timesync_ntp_servers:
1414
- hostname: clock.redhat.com
15-
edpm_iscsid_image: '{{ registry_url }}/openstack-iscsid:{{ image_tag }}'
1615
edpm_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}'
1716
edpm_network_config_hide_sensitive_logs: false
1817
edpm_network_config_os_net_config_mappings:

‎config/samples/dataplane/pre_ceph_hci/values.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ data:
1515
# CHANGEME -- see https://access.redhat.com/solutions/253273
1616
# edpm_bootstrap_command: |
1717
# subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }}
18-
edpm_iscsid_image: '{{ registry_url }}/openstack-iscsid:{{ image_tag }}'
1918
edpm_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}'
2019
edpm_network_config_hide_sensitive_logs: false
2120
edpm_network_config_os_net_config_mappings:

‎config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ spec:
1616
edpmServiceType: nova
1717
containerImageFields:
1818
- NovaComputeImage
19-
- EdpmIscsidImage

‎config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ spec:
66
playbook: osp.edpm.run_os
77
containerImageFields:
88
- EdpmLogrotateCrondImage
9-
- EdpmIscsidImage
109
edpmServiceType: run-os

‎docs/assemblies/common_configurations.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ customized locations. The ansible variables used to set the locations and their
7979
default values are:
8080

8181
ifeval::["{build}" != "downstream"]
82-
edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid
8382
edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron
8483
edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller
8584
edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr
@@ -103,7 +102,6 @@ ifeval::["{build}" != "downstream"]
103102
edpm_swift_object_image: "quay.io/podified-antelope-centos9/openstack-swift-object
104103
endif::[]
105104
ifeval::["{build}" == "downstream"]
106-
edpm_iscsid_image: "redhat.registry.io/rhoso-beta/openstack-iscsid-rhel9:18.0.0
107105
edpm_logrotate_crond_image: "redhat.registry.io/rhoso-beta/openstack-cron-rhel9:18.0.0
108106
edpm_ovn_controller_agent_image: "redhat.registry.io/rhoso-beta/openstack-ovn-controller-rhel9:18.0.0
109107
edpm_frr_image: "redhat.registry.io/rhoso-beta/openstack-frr-rhel9:18.0.0

‎docs/assemblies/ctlplane_resources.adoc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,11 +2033,6 @@ ContainerTemplate - struct that contains container image URLs for each service i
20332033
| *string
20342034
| false
20352035
2036-
| edpmIscsidImage
2037-
|
2038-
| *string
2039-
| false
2040-
20412036
| edpmLogrotateCrondImage
20422037
|
20432038
| *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
@@ -280,7 +280,6 @@ spec:
280280
...
281281
ansibleVars:
282282
ifeval::["{build}" != "downstream"]
283-
edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"
284283
edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron:current-podified"
285284
edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified"
286285
edpm_ovn_metadata_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"
@@ -293,7 +292,6 @@ ifeval::["{build}" != "downstream"]
293292
edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
294293
endif::[]
295294
ifeval::["{build}" == "downstream"]
296-
edpm_iscsid_image: "registry.redhat.io/rhosp-dev-preview/openstack-iscsid:18.0"
297295
edpm_logrotate_crond_image: "registry.redhat.io/rhosp-dev-preview/openstack-cron:18.0"
298296
edpm_ovn_controller_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0"
299297
edpm_ovn_metadata_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-metadata-agent-ovn:18.0"

0 commit comments

Comments
 (0)