diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-22 02:43:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-22 02:43:58 +0000 |
| commit | 3d7bcca9904a1cc2eea032148d41462db0eee6df (patch) | |
| tree | 4f1beeb6d951eae58ea79e3ac63bba3fedea7c26 /etc | |
| parent | 3a7440b370f5c2bf6f255a6530349a3e680007b9 (diff) | |
| parent | 0158221fd2972c7c0c3733994f985feb8318121d (diff) | |
| download | kolla-ansible-3d7bcca9904a1cc2eea032148d41462db0eee6df.tar.gz kolla-ansible-3d7bcca9904a1cc2eea032148d41462db0eee6df.zip | |
Merge "Drop support for Cinder ZFSSA backend"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/kolla/globals.yml | 3 | ||||
| -rw-r--r-- | etc/kolla/passwords.yml | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index b05f8c55a..ed8fb12a4 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 32dcfebb8..684d31353 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 ####################### |