From 0158221fd2972c7c0c3733994f985feb8318121d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Mon, 21 Jun 2021 09:50:18 +0000 Subject: [PATCH] Drop support for Cinder ZFSSA backend Following upstream which removed ZFSSA support in Ussuri [1]. [1] https://review.opendev.org/c/openstack/cinder/+/690137 Change-Id: Idb311e18b437fba696759ecb1cf2a6b4803aa5c5 --- ansible/group_vars/all.yml | 3 +-- ansible/roles/cinder/defaults/main.yml | 14 -------------- ansible/roles/cinder/tasks/precheck.yml | 1 - ansible/roles/cinder/templates/cinder.conf.j2 | 14 -------------- etc/kolla/globals.yml | 3 +-- etc/kolla/passwords.yml | 5 ----- .../notes/drop-zfssa-2708a8c0b0eb5f43.yaml | 5 +++++ 7 files changed, 7 insertions(+), 38 deletions(-) create mode 100644 releasenotes/notes/drop-zfssa-2708a8c0b0eb5f43.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index cf0ebd198b..393dce76be 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -587,10 +587,9 @@ enable_chrony: "no" enable_cinder: "no" enable_cinder_backup: "yes" enable_cinder_backend_hnas_nfs: "no" -enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool or enable_cinder_backend_zfssa_iscsi | bool }}" +enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool }}" enable_cinder_backend_lvm: "no" enable_cinder_backend_nfs: "no" -enable_cinder_backend_zfssa_iscsi: "no" enable_cinder_backend_quobyte: "no" enable_cloudkitty: "no" enable_collectd: "no" diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 0c577d3fa4..9ea5faf401 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -218,8 +218,6 @@ cinder_backends: enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}" - name: "vmwarevc-vmdk" enabled: "{{ cinder_backend_vmwarevc_vmdk | bool }}" - - name: "zfssa-iscsi" - enabled: "{{ enable_cinder_backend_zfssa_iscsi | bool }}" - name: "QuobyteHD" enabled: "{{ enable_cinder_backend_quobyte | bool }}" @@ -248,18 +246,6 @@ hnas_nfs_mgmt_ip0: hnas_nfs_svc0_volume_type: hnas_nfs_svc0_hdp: -############################################# -# Oracle ZFS Storage Appliance iSCSI driver -############################################# -zfssa_iscsi_backend: "zfssa_iscsi_backend" -zfssa_iscsi_san_ip: -zfssa_iscsi_login: -zfssa_iscsi_pool: -zfssa_iscsi_project: -zfssa_iscsi_initiator_group: -zfssa_iscsi_target_portal: -zfssa_iscsi_target_interfaces: - ######################### # Quobyte Storage Driver ######################### diff --git a/ansible/roles/cinder/tasks/precheck.yml b/ansible/roles/cinder/tasks/precheck.yml index febe0295b1..810bbaff26 100644 --- a/ansible/roles/cinder/tasks/precheck.yml +++ b/ansible/roles/cinder/tasks/precheck.yml @@ -35,7 +35,6 @@ - not enable_cinder_backend_nfs | bool - not cinder_backend_ceph | bool - not cinder_backend_vmwarevc_vmdk | bool - - not enable_cinder_backend_zfssa_iscsi | bool - not enable_cinder_backend_quobyte | bool - name: Checking LVM volume group exists for Cinder diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 65bed63b48..6e838077e0 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -183,20 +183,6 @@ vmware_cluster_name = {{ vmware_vcenter_cluster_name }} vmware_insecure = True {% endif %} -{% if enable_cinder_backend_zfssa_iscsi | bool %} -[zfssa-iscsi] -volume_backend_name = {{ zfssa_iscsi_backend }} -volume_driver = cinder.volume.drivers.zfssa.zfssaiscsi.ZFSSAISCSIDriver -san_ip = {{ zfssa_iscsi_san_ip }} -san_login = {{ zfssa_iscsi_login }} -san_password = {{ zfssa_iscsi_password }} -zfssa_pool = {{ zfssa_iscsi_pool }} -zfssa_project = {{ zfssa_iscsi_project }} -zfssa_initiator_group = {{ zfssa_iscsi_initiator_group }} -zfssa_target_portal = {{ zfssa_iscsi_target_portal }} -zfssa_target_interfaces = {{ zfssa_iscsi_target_interfaces }} -{% endif %} - {% if enable_cinder_backend_quobyte | bool %} [QuobyteHD] volume_driver = cinder.volume.drivers.quobyte.QuobyteDriver diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 2471f734cd..c01eeb943a 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -283,10 +283,9 @@ #enable_cinder: "no" #enable_cinder_backup: "yes" #enable_cinder_backend_hnas_nfs: "no" -#enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool or enable_cinder_backend_zfssa_iscsi | bool }}" +#enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool }}" #enable_cinder_backend_lvm: "no" #enable_cinder_backend_nfs: "no" -#enable_cinder_backend_zfssa_iscsi: "no" #enable_cinder_backend_quobyte: "no" #enable_cloudkitty: "no" #enable_collectd: "no" diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 32dcfebb88..684d313531 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -35,11 +35,6 @@ nsxv3_api_password: ##################### hnas_nfs_password: -###################### -# Oracle ZFSSA support -###################### -zfssa_iscsi_password: - ####################### # Infoblox IPAM support ####################### diff --git a/releasenotes/notes/drop-zfssa-2708a8c0b0eb5f43.yaml b/releasenotes/notes/drop-zfssa-2708a8c0b0eb5f43.yaml new file mode 100644 index 0000000000..6a13c12101 --- /dev/null +++ b/releasenotes/notes/drop-zfssa-2708a8c0b0eb5f43.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Following Cinder upstream, support for using ZFSSA with Cinder has been + removed. ZFSSA was unsupported in Train and later removed in Ussuri.