Merge "Remove ``hnas_iscsi`` from the supported storage backends list of Cinder"

ansible/group_vars/all.yml

@@ -529,9 +529,8 @@ enable_ceph_dashboard: "{{ enable_ceph | bool }}"
 enable_chrony: "yes"
 enable_cinder: "no"
 enable_cinder_backup: "yes"
-enable_cinder_backend_hnas_iscsi: "no"
 enable_cinder_backend_hnas_nfs: "no"
-enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool or enable_cinder_backend_hnas_iscsi | bool or enable_cinder_backend_zfssa_iscsi | bool }}"
+enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool or enable_cinder_backend_zfssa_iscsi | bool }}"
 enable_cinder_backend_lvm: "no"
 enable_cinder_backend_nfs: "no"
 enable_cinder_backend_zfssa_iscsi: "no"

ansible/roles/cinder/defaults/main.yml

@@ -190,8 +190,6 @@ cinder_backends:
     enabled: "{{ enable_cinder_backend_lvm | bool }}"
   - name: "nfs-1"
     enabled: "{{ enable_cinder_backend_nfs | bool }}"
-  - name: "hnas-iscsi"
-    enabled: "{{ enable_cinder_backend_hnas_iscsi | bool }}"
   - name: "hnas-nfs"
     enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}"
   - name: "vmwarevc-vmdk"
@@ -216,17 +214,9 @@ cinder_notification_topics:
 
 cinder_enabled_notification_topics: "{{ cinder_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
 
-#############################################
-# Hitachi NAS Platform iSCSI and NFS drivers
-#############################################
-# iscsi
-hnas_iscsi_backend: "hnas_iscsi_backend"
-hnas_iscsi_username:
-hnas_iscsi_mgmt_ip0:
-hnas_iscsi_svc0_volume_type:
-hnas_iscsi_svc0_hdp:
-hnas_iscsi_svc0_ip:
-
+##################################
+# Hitachi NAS Platform NFS drivers
+##################################
 # nfs
 hnas_nfs_backend: "hnas_nfs_backend"
 hnas_nfs_username:

ansible/roles/cinder/tasks/precheck.yml

@@ -22,7 +22,6 @@
   local_action: fail msg="Please enable at least one backend when enabling Cinder"
   when:
     - not skip_cinder_backend_check | bool
-    - not enable_cinder_backend_hnas_iscsi | bool
     - not enable_cinder_backend_hnas_nfs | bool
     - not enable_cinder_backend_iscsi | bool
     - not enable_cinder_backend_lvm | bool

ansible/roles/cinder/templates/cinder.conf.j2

@@ -145,20 +145,6 @@ nas_secure_file_permissions = False
 nas_secure_file_operations = False
 {% endif %}
 
-{% if enable_cinder_backend_hnas_iscsi | bool %}
-[hnas-iscsi]
-volume_driver = cinder.volume.drivers.hitachi.hnas_iscsi.HNASISCSIDriver
-volume_backend_name = {{ hnas_iscsi_backend }}
-hnas_username = {{ hnas_iscsi_username }}
-hnas_password = {{ hnas_iscsi_password }}
-hnas_mgmt_ip0 = {{ hnas_iscsi_mgmt_ip0 }}
-hnas_chap_enabled = True
-
-hnas_svc0_volume_type = {{ hnas_iscsi_svc0_volume_type }}
-hnas_svc0_hdp = {{ hnas_iscsi_svc0_hdp }}
-hnas_svc0_iscsi_ip = {{ hnas_iscsi_svc0_ip }}
-{% endif %}
-
 {% if enable_cinder_backend_hnas_nfs | bool %}
 [hnas-nfs]
 volume_driver = cinder.volume.drivers.hitachi.hnas_nfs.HNASNFSDriver

doc/source/reference/storage/cinder-guide-hnas.rst

@@ -54,43 +54,8 @@ The NFS and iSCSI drivers support these operations:
 
 - Manage and unmanage snapshots (HNAS NFS only).
 
-Configuration example for Hitachi NAS Platform iSCSI and NFS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-iSCSI backend
--------------
-
-Enable cinder hnas backend iscsi in ``/etc/kolla/globals.yml``
-
-.. code-block:: yaml
-
-   enable_cinder_backend_hnas_iscsi: "yes"
-
-Create or modify the file ``/etc/kolla/config/cinder.conf`` and add the
-contents:
-
-.. path /etc/kolla/config/cinder.conf
-.. code-block:: ini
-
-   [DEFAULT]
-   enabled_backends = hnas-iscsi
-
-   [hnas-iscsi]
-   volume_driver = cinder.volume.drivers.hitachi.hnas_iscsi.HNASISCSIDriver
-   volume_iscsi_backend = hnas_iscsi_backend
-   hnas_iscsi_username = supervisor
-   hnas_iscsi_mgmt_ip0 = <hnas_ip>
-   hnas_chap_enabled = True
-
-   hnas_iscsi_svc0_volume_type = iscsi_gold
-   hnas_iscsi_svc0_hdp = FS-Baremetal1
-   hnas_iscsi_svc0_iscsi_ip = <svc0_ip>
-
-Then set password for the backend in ``/etc/kolla/passwords.yml``:
-
-.. code-block:: yaml
-
-   hnas_iscsi_password: supervisor
+Configuration example for Hitachi NAS Platform NFS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 NFS backend
 -----------

doc/source/reference/storage/cinder-guide.rst

@@ -11,7 +11,6 @@ Cinder can be deployed using Kolla and supports the following storage
 backends:
 
 * ceph
-* hnas_iscsi
 * hnas_nfs
 * iscsi
 * lvm

etc/kolla/globals.yml

@@ -201,7 +201,6 @@
 #enable_chrony: "yes"
 #enable_cinder: "no"
 #enable_cinder_backup: "yes"
-#enable_cinder_backend_hnas_iscsi: "no"
 #enable_cinder_backend_hnas_nfs: "no"
 #enable_cinder_backend_iscsi: "no"
 #enable_cinder_backend_lvm: "no"

etc/kolla/passwords.yml

@@ -40,7 +40,6 @@ nsxv3_api_password:
 #####################
 # Hitachi NAS support
 #####################
-hnas_iscsi_password:
 hnas_nfs_password:
 
 ######################

releasenotes/notes/remove-cinder-hnas_iscsi-backend-03e6242227b9184c.yaml

@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    Remove the ``hnas_iscsi`` cinder backend. The Hitachi NAS Platform
+    iSCSI driver was `marked as not supported by Cinder
+    <https://docs.openstack.org/releasenotes/cinder/ocata.html#deprecation-notes>`_
+    in the Ocata release.