Remove options to enable GlusterFS volume in Cinder

The GlusterFS volume driver was removed from Cinder in Ocata release.

This review is removing the options to enable it in Packstack:

- gluster is not longer accepted in CONFIG_CINDER_BACKEND parameter.
- Parameter CONFIG_CINDER_GLUSTER_MOUNTS has been removed.

Change-Id: I972c0807ace53536c9fd008a2379c2b55b429441
This commit is contained in:
Alfredo Moralejo 2020-07-10 09:11:55 +02:00
parent 339c8fc04f
commit 116c22e0ab
8 changed files with 9 additions and 63 deletions

View File

@ -483,7 +483,7 @@ Cinder Config parameters
Password to use for the Block Storage service to authenticate with the Identity service.
**CONFIG_CINDER_BACKEND**
Storage backend to use for the Block Storage service; valid options are: lvm, gluster, nfs, vmdk, netapp, solidfire. ['lvm', 'gluster', 'nfs', 'vmdk', 'netapp', 'solidfire']
Storage backend to use for the Block Storage service; valid options are: lvm, nfs, vmdk, netapp, solidfire. ['lvm', 'nfs', 'vmdk', 'netapp', 'solidfire']
Cinder volume create Config parameters
--------------------------------------
@ -503,12 +503,6 @@ Cinder lvm Config parameters
**CONFIG_CINDER_VOLUME_NAME**
Specify a custom name for the lvm cinder volume group
Cinder gluster Config parameters
--------------------------------
**CONFIG_CINDER_GLUSTER_MOUNTS**
A single or comma-separated list of Red Hat Storage (gluster) volume shares to mount. Example: 'ip-address:/vol-name', 'domain:/vol-name'
Cinder NFS Config parameters
----------------------------

View File

@ -85,7 +85,7 @@ def initConfig(controller):
{"CMD_OPTION": "cinder-backend",
"PROMPT": "Enter the Cinder backend to be configured",
"OPTION_LIST": ["lvm", "gluster", "nfs", "vmdk", "netapp",
"OPTION_LIST": ["lvm", "nfs", "vmdk", "netapp",
"solidfire"],
"VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "lvm",
@ -140,23 +140,6 @@ def initConfig(controller):
"CONDITION": False},
],
"CINDERGLUSTERMOUNTS": [
{"CMD_OPTION": "cinder-gluster-mounts",
"PROMPT": ("Enter a single or comma separated list of gluster "
"volume shares to use with Cinder"),
"OPTION_LIST": ["^([\d]{1,3}\.){3}[\d]{1,3}:/.*",
"^[a-zA-Z0-9][\-\.\w]*:/.*"],
"VALIDATORS": [validators.validate_multi_regexp],
"PROCESSORS": [],
"DEFAULT_VALUE": "",
"MASK_INPUT": False,
"LOOSE_VALIDATION": True,
"CONF_NAME": "CONFIG_CINDER_GLUSTER_MOUNTS",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
],
"CINDERNFSMOUNTS": [
{"CMD_OPTION": "cinder-nfs-mounts",
"PROMPT": ("Enter a single or comma seprated list of NFS exports "
@ -528,13 +511,6 @@ def initConfig(controller):
"POST_CONDITION": False,
"POST_CONDITION_MATCH": True},
{"GROUP_NAME": "CINDERGLUSTERMOUNTS",
"DESCRIPTION": "Cinder gluster Config parameters",
"PRE_CONDITION": check_gluster_options,
"PRE_CONDITION_MATCH": True,
"POST_CONDITION": False,
"POST_CONDITION_MATCH": True},
{"GROUP_NAME": "CINDERNFSMOUNTS",
"DESCRIPTION": "Cinder NFS Config parameters",
"PRE_CONDITION": check_nfs_options,
@ -613,7 +589,6 @@ def initSequences(controller):
)
for key in ('CONFIG_CINDER_NETAPP_VOLUME_LIST',
'CONFIG_CINDER_GLUSTER_MOUNTS',
'CONFIG_CINDER_NFS_MOUNTS'):
if key in config:
config[key] = [i.strip() for i in config[key].split(',') if i]
@ -644,11 +619,6 @@ def check_lvm_vg_options(config):
'lvm' in config['CONFIG_CINDER_BACKEND'])
def check_gluster_options(config):
return (config['CONFIG_CINDER_INSTALL'] == 'y' and
'gluster' in config['CONFIG_CINDER_BACKEND'])
def check_nfs_options(config):
return (config['CONFIG_CINDER_INSTALL'] == 'y' and
'nfs' in config['CONFIG_CINDER_BACKEND'])

View File

@ -7,7 +7,6 @@ class packstack::cinder ()
case $cinder_backends[0] {
'lvm': { $default_volume_type = 'iscsi' }
'gluster': { $default_volume_type = 'glusterfs' }
'nfs': { $default_volume_type = 'nfs' }
'vmdk': { $default_volume_type = 'vmdk' }
'netapp': { $default_volume_type = 'netapp' }

View File

@ -1,16 +0,0 @@
class packstack::cinder::backend::gluster ()
{
ensure_packages(['glusterfs-fuse'], {'ensure' => 'present'})
cinder::backend::glusterfs { 'gluster':
glusterfs_shares => hiera_array('CONFIG_CINDER_GLUSTER_MOUNTS'),
require => Package['glusterfs-fuse'],
glusterfs_shares_config => '/etc/cinder/glusterfs_shares.conf',
}
cinder_type { 'glusterfs':
ensure => present,
properties => ['volume_backend_name=gluster'],
require => Class['cinder::api'],
}
}

View File

@ -1,4 +0,0 @@
class packstack::nova::gluster ()
{
ensure_packages(['glusterfs-fuse'], {'ensure' => 'present'})
}

View File

@ -34,9 +34,6 @@ if hiera('CONFIG_VMWARE_BACKEND') == 'y' {
if hiera('CONFIG_CINDER_INSTALL') == 'y' and
hiera('CONFIG_VMWARE_BACKEND') != 'y' {
if 'gluster' in hiera_array('CONFIG_CINDER_BACKEND') {
include '::packstack::nova::gluster'
}
if 'nfs' in hiera_array('CONFIG_CINDER_BACKEND') {
include '::packstack::nova::nfs'
}

View File

@ -50,7 +50,6 @@ if hiera('CONFIG_CINDER_INSTALL') == 'y' {
case $cinder_backends[0] {
'lvm': { include '::packstack::cinder::backend::lvm' }
'gluster': { include '::packstack::cinder::backend::gluster' }
'nfs': { include '::packstack::cinder::backend::nfs' }
'vmdk': { include '::packstack::cinder::backend::vmdk' }
'netapp': { include '::packstack::cinder::backend::netapp' }

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The GlusterFS volume driver was removed from Cinder in Ocata release. The options to
enable it in Packstack have been removed:
- `gluster` is not longer accepted in CONFIG_CINDER_BACKEND parameter.
- Parameter `CONFIG_CINDER_GLUSTER_MOUNTS` has been removed.