From ce51f0d6cbbfdfd747ca31da0184229253ce90e9 Mon Sep 17 00:00:00 2001 From: jproque-dell Date: Tue, 6 Feb 2024 14:13:03 +0000 Subject: [PATCH 1/3] Samples: Add Dell PowerMax ISCSI backend samples --- .../backends/dell/powermax/iscsi/backend.yaml | 31 +++++++++++++++++++ .../iscsi/cinder-volume-powermax-secrets.yaml | 17 ++++++++++ .../dell/powermax/iscsi/kustomization.yaml | 7 +++++ 3 files changed, 55 insertions(+) create mode 100644 config/samples/backends/dell/powermax/iscsi/backend.yaml create mode 100644 config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml create mode 100644 config/samples/backends/dell/powermax/iscsi/kustomization.yaml diff --git a/config/samples/backends/dell/powermax/iscsi/backend.yaml b/config/samples/backends/dell/powermax/iscsi/backend.yaml new file mode 100644 index 00000000..da2f508c --- /dev/null +++ b/config/samples/backends/dell/powermax/iscsi/backend.yaml @@ -0,0 +1,31 @@ +# To be able to use this sample it is necessary to: +# - Have a Dell PowerMax backend with iSCSI support +# - Have the Unisphere for PowerMax credentials in cinder-volume-powermax-secrets.yaml +# - Having iscsid and multpathd running on the host (automatically done by this sample) +# +# The correct way to configure and run the daemons is using `MachineConfig` as shown in `iscsid.yaml` and `multipathd.yaml`, like this sample does. +# +# ATTENTION: After applying this OpenShift nodes will reboot, because of the `MachineConfig` changes and will take a while to recover. + +apiVersion: core.openstack.org/v1beta1 +kind: OpenStackControlPlane +metadata: + name: openstack +spec: + cinder: + template: + cinderVolumes: + powermax-iscsi: + networkAttachments: + - storage + customServiceConfigSecrets: + - cinder-volume-powermax-secrets + customServiceConfig: | + [powermax-iscsi] + volume_backend_name=powermax + volume_driver = cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver + powermax_port_groups = [OS-ISCSI-PG] + powermax_array = 000120001607 + powermax_srp = SRP_1 + image_volume_cache_enabled = True + use_multipath_for_image_xfer = True diff --git a/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml b/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml new file mode 100644 index 00000000..7d75fabe --- /dev/null +++ b/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml @@ -0,0 +1,17 @@ +# Define the "cinder-volume-powermax-secrets" Secret that contains sensitive +# information pertaining to the [powermax-iscsi] backend. +apiVersion: v1 +kind: Secret +metadata: + labels: + service: cinder + component: cinder-volume + name: cinder-volume-powermax-secrets +type: Opaque +stringData: + powermax-secrets.conf: | + [powermax-iscsi] + san_ip = 10.225.104.114 + san_login = smc + san_password = smc + diff --git a/config/samples/backends/dell/powermax/iscsi/kustomization.yaml b/config/samples/backends/dell/powermax/iscsi/kustomization.yaml new file mode 100644 index 00000000..314f9288 --- /dev/null +++ b/config/samples/backends/dell/powermax/iscsi/kustomization.yaml @@ -0,0 +1,7 @@ +resources: + - ../../../bases/iscsid + - ../../../bases/multipathd + - ../../../bases/openstack + - cinder-volume-powermax-secrets.yaml +patches: + - path: backend.yaml From c06cbbf9c107ed371e1382c9b65c73b536b6e679 Mon Sep 17 00:00:00 2001 From: jproque-dell Date: Tue, 6 Feb 2024 14:13:03 +0000 Subject: [PATCH 2/3] Samples: Add Dell PowerMax ISCSI backend samples --- config/samples/backends/README.md | 1 + .../backends/dell/powermax/iscsi/backend.yaml | 30 +++++++++++++++++++ .../iscsi/cinder-volume-powermax-secrets.yaml | 17 +++++++++++ .../dell/powermax/iscsi/kustomization.yaml | 7 +++++ 4 files changed, 55 insertions(+) create mode 100644 config/samples/backends/dell/powermax/iscsi/backend.yaml create mode 100644 config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml create mode 100644 config/samples/backends/dell/powermax/iscsi/kustomization.yaml diff --git a/config/samples/backends/README.md b/config/samples/backends/README.md index 95ec0ef5..4744528b 100644 --- a/config/samples/backends/README.md +++ b/config/samples/backends/README.md @@ -32,6 +32,7 @@ Currently available samples are: - Pure Storage iSCSI - Pure Storage FC - Pure Storage NVMe-RoCE +- Dell PowerMax iSCSI **NOTE**: These examples are designed to be applied one at time. If you attempt to add a second backend by applying a second example it will result in the diff --git a/config/samples/backends/dell/powermax/iscsi/backend.yaml b/config/samples/backends/dell/powermax/iscsi/backend.yaml new file mode 100644 index 00000000..8e68b407 --- /dev/null +++ b/config/samples/backends/dell/powermax/iscsi/backend.yaml @@ -0,0 +1,30 @@ +# To be able to use this sample it is necessary to: +# - Have a Dell PowerMax backend with iSCSI support +# - Have the Unisphere for PowerMax credentials in cinder-volume-powermax-secrets.yaml +# - Having iscsid and multpathd running on the host (automatically done by this sample) +# +# The correct way to configure and run the daemons is using `MachineConfig` as shown in `iscsid.yaml` and `multipathd.yaml`, like this sample does. +# +# ATTENTION: After applying this OpenShift nodes will reboot, because of the `MachineConfig` changes and will take a while to recover. + +apiVersion: core.openstack.org/v1beta1 +kind: OpenStackControlPlane +metadata: + name: openstack +spec: + cinder: + template: + cinderVolumes: + powermax-iscsi: + networkAttachments: + - storage + customServiceConfigSecrets: + - cinder-volume-powermax-secrets + customServiceConfig: | + [powermax-iscsi] + volume_backend_name=powermax + volume_driver = cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver + powermax_port_groups = [OS-ISCSI-PG] + powermax_array = 000120001607 + powermax_srp = SRP_1 + image_volume_cache_enabled = True diff --git a/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml b/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml new file mode 100644 index 00000000..7d75fabe --- /dev/null +++ b/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml @@ -0,0 +1,17 @@ +# Define the "cinder-volume-powermax-secrets" Secret that contains sensitive +# information pertaining to the [powermax-iscsi] backend. +apiVersion: v1 +kind: Secret +metadata: + labels: + service: cinder + component: cinder-volume + name: cinder-volume-powermax-secrets +type: Opaque +stringData: + powermax-secrets.conf: | + [powermax-iscsi] + san_ip = 10.225.104.114 + san_login = smc + san_password = smc + diff --git a/config/samples/backends/dell/powermax/iscsi/kustomization.yaml b/config/samples/backends/dell/powermax/iscsi/kustomization.yaml new file mode 100644 index 00000000..314f9288 --- /dev/null +++ b/config/samples/backends/dell/powermax/iscsi/kustomization.yaml @@ -0,0 +1,7 @@ +resources: + - ../../../bases/iscsid + - ../../../bases/multipathd + - ../../../bases/openstack + - cinder-volume-powermax-secrets.yaml +patches: + - path: backend.yaml From 68fb7fd8625e9dd6c58f4877dc87fbe231fa8028 Mon Sep 17 00:00:00 2001 From: jproque-dell Date: Tue, 20 Feb 2024 20:46:56 +0100 Subject: [PATCH 3/3] Update cinder-volume-powermax-secrets.yaml Remove empty line. --- .../dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml b/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml index 7d75fabe..a61034ec 100644 --- a/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml +++ b/config/samples/backends/dell/powermax/iscsi/cinder-volume-powermax-secrets.yaml @@ -14,4 +14,3 @@ stringData: san_ip = 10.225.104.114 san_login = smc san_password = smc -