openstack/kolla-ansible
Code Issues Proposed changes

Merge "Drop support for Cinder ZFSSA backend"

Browse Source
This commit is contained in:
Zuul 2021-06-22 02:43:58 +00:00 committed by Gerrit Code Review
commit 3d7bcca990
7 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -587,10 +587,9 @@ enable_chrony: "no"
enable_cinder: "no" enable_cinder: "no"
enable_cinder_backup: "yes" enable_cinder_backup: "yes"
enable_cinder_backend_hnas_nfs: "no" 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_lvm: "no"
enable_cinder_backend_nfs: "no" enable_cinder_backend_nfs: "no"
enable_cinder_backend_zfssa_iscsi: "no"
enable_cinder_backend_quobyte: "no" enable_cinder_backend_quobyte: "no"
enable_cloudkitty: "no" enable_cloudkitty: "no"
enable_collectd: "no" enable_collectd: "no"

14
ansible/roles/cinder/defaults/main.yml
View File

@ -218,8 +218,6 @@ cinder_backends:
enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}" enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}"
- name: "vmwarevc-vmdk" - name: "vmwarevc-vmdk"
enabled: "{{ cinder_backend_vmwarevc_vmdk | bool }}" enabled: "{{ cinder_backend_vmwarevc_vmdk | bool }}"
- name: "zfssa-iscsi"
enabled: "{{ enable_cinder_backend_zfssa_iscsi | bool }}"
- name: "QuobyteHD" - name: "QuobyteHD"
enabled: "{{ enable_cinder_backend_quobyte | bool }}" enabled: "{{ enable_cinder_backend_quobyte | bool }}"
@ -248,18 +246,6 @@ hnas_nfs_mgmt_ip0:
hnas_nfs_svc0_volume_type: hnas_nfs_svc0_volume_type:
hnas_nfs_svc0_hdp: 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 # Quobyte Storage Driver
######################### #########################

1
ansible/roles/cinder/tasks/precheck.yml
View File

@ -35,7 +35,6 @@
- not enable_cinder_backend_nfs | bool - not enable_cinder_backend_nfs | bool
- not cinder_backend_ceph | bool - not cinder_backend_ceph | bool
- not cinder_backend_vmwarevc_vmdk | bool - not cinder_backend_vmwarevc_vmdk | bool
- not enable_cinder_backend_zfssa_iscsi | bool
- not enable_cinder_backend_quobyte | bool - not enable_cinder_backend_quobyte | bool
- name: Checking LVM volume group exists for Cinder - name: Checking LVM volume group exists for Cinder

14
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -183,20 +183,6 @@ vmware_cluster_name = {{ vmware_vcenter_cluster_name }}
vmware_insecure = True vmware_insecure = True
{% endif %} {% 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 %} {% if enable_cinder_backend_quobyte | bool %}
[QuobyteHD] [QuobyteHD]
volume_driver = cinder.volume.drivers.quobyte.QuobyteDriver volume_driver = cinder.volume.drivers.quobyte.QuobyteDriver

3
etc/kolla/globals.yml
View File

@ -283,10 +283,9 @@
#enable_cinder: "no" #enable_cinder: "no"
#enable_cinder_backup: "yes" #enable_cinder_backup: "yes"
#enable_cinder_backend_hnas_nfs: "no" #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_lvm: "no"
#enable_cinder_backend_nfs: "no" #enable_cinder_backend_nfs: "no"
#enable_cinder_backend_zfssa_iscsi: "no"
#enable_cinder_backend_quobyte: "no" #enable_cinder_backend_quobyte: "no"
#enable_cloudkitty: "no" #enable_cloudkitty: "no"
#enable_collectd: "no" #enable_collectd: "no"

5
etc/kolla/passwords.yml
View File

@ -35,11 +35,6 @@ nsxv3_api_password:
##################### #####################
hnas_nfs_password: hnas_nfs_password:
######################
# Oracle ZFSSA support
######################
zfssa_iscsi_password:
####################### #######################
# Infoblox IPAM support # Infoblox IPAM support
####################### #######################

5
releasenotes/notes/drop-zfssa-2708a8c0b0eb5f43.yaml Normal file
View File

@ -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.