x/packstack
Code Issues Proposed changes

Merge "Update Manila share driver options"

Browse Source
This commit is contained in:
Jenkins
2015-04-24 10:50:28 +00:00
committed by Gerrit Code Review
parent e6d6d84da8 69362c55e8
commit 1d54be33de
4 changed files with 171 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
docs/packstack.rst
View File

@@ -567,30 +567,51 @@ Manila Config parameters
Manila NetApp configuration
---------------------------
**CONFIG_MANILA_NETAPP_NAS_TRANSPORT_TYPE**
Transport protocol used when communicating with ONTAPI on the NetApp storage system or proxy server. Valid options are http or https. Defaults to http. ['http', 'https']
**CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS**
Denotes whether the driver should handle the responsibility of managing share servers. This must be set to false if the driver is to operate without managing share servers. Defaults to 'false' ['true', 'false']
**CONFIG_MANILA_NETAPP_NAS_LOGIN**
Administrative user account name used to access the NetApp storage system or proxy server. ['']
**CONFIG_MANILA_NETAPP_TRANSPORT_TYPE**
The transport protocol used when communicating with the storage system or proxy server. Valid values are 'http' and 'https'. Defaults to 'https'. ['https', 'http']
**CONFIG_MANILA_NETAPP_NAS_PASSWORD**
Password for the NetApp administrative user account specified in the CONFIG_MANILA_NETAPP_NAS_LOGIN parameter. ['']
**CONFIG_MANILA_NETAPP_LOGIN**
Administrative user account name used to access the NetApp storage system. Defaults to ''.
**CONFIG_MANILA_NETAPP_NAS_SERVER_HOSTNAME**
Hostname (or IP address) for the NetApp storage system or proxy server.
**CONFIG_MANILA_NETAPP_PASSWORD**
Password for the NetApp administrative user account specified in the CONFIG_MANILA_NETAPP_LOGIN parameter. Defaults to ''.
**CONFIG_MANILA_NETAPP_SERVER_HOSTNAME**
Hostname (or IP address) for the NetApp storage system or proxy server. Defaults to ''.
**CONFIG_MANILA_NETAPP_STORAGE_FAMILY**
The storage family type used on the storage system; valid values are ontap_cluster for clustered Data ONTAP. Defaults to 'ontap_cluster'. ['ontap_cluster']
**CONFIG_MANILA_NETAPP_SERVER_PORT**
The TCP port to use for communication with the storage system or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP and 443 for HTTPS. Defaults to '443'.
**CONFIG_MANILA_NETAPP_AGGREGATE_NAME_SEARCH_PATTERN**
Pattern for searching available aggregates for NetApp provisioning.
Pattern for searching available aggregates for NetApp provisioning. Defaults to '(.*)'.
Manila NetApp Multi-SVM configuration
-------------------------------------
**CONFIG_MANILA_NETAPP_ROOT_VOLUME_AGGREGATE**
Name of aggregate on which to create the NetApp root volume.
Name of aggregate on which to create the NetApp root volume. This option only applies when the option CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS is set to True.
**CONFIG_MANILA_NETAPP_ROOT_VOLUME_NAME**
NetApp root volume name.
NetApp root volume name. Defaults to 'root'.
Manila NetApp Single-SVM configuration
--------------------------------------
**CONFIG_MANILA_NETAPP_VSERVER**
This option specifies the storage virtual machine (previously called a Vserver) name on the storage cluster on which provisioning of shared file systems should occur. This option only applies when the option driver_handles_share_servers is set to False. Defaults to ''.
Manila generic driver configuration
-----------------------------------
**CONFIG_MANILA_GENERIC_DRV_HANDLES_SHARE_SERVERS**
Denotes whether the driver should handle the responsibility of managing share servers. This must be set to false if the driver is to operate without managing share servers. Defaults to 'true'. ['true', 'false']
**CONFIG_MANILA_GENERIC_VOLUME_NAME_TEMPLATE**
Volume name template for Manila service. Defaults to 'manila-share-%s'.
@@ -598,7 +619,7 @@ Manila generic driver configuration
Share mount path for Manila service. Defaults to '/shares'.
**CONFIG_MANILA_SERVICE_IMAGE_LOCATION**
Location of disk image for Manila service instance.
Location of disk image for Manila service instance. Defaults to 'https://www.dropbox.com/s/vi5oeh10q1qkckh/ubuntu_1204_nfs_cifs.qcow2'.
**CONFIG_MANILA_SERVICE_INSTANCE_USER**
User in Manila service instance.

143
packstack/plugins/manila_255.py
View File

@@ -27,7 +27,7 @@ from packstack.modules.ospluginutils import getManifestTemplate
from packstack.modules.ospluginutils import appendManifestFile
from packstack.modules.ospluginutils import createFirewallResources
# ------------- Manila Packstack Plugin Initialization --------------
# ------------- Manila Packstack Plugin Initialization --------------
PLUGIN_NAME = "OS-Manila"
PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue')
@@ -76,51 +76,89 @@ def initConfig(controller):
],
"MANILANETAPP": [
{"CMD_OPTION": "manila-netapp-nas-transport-type",
"PROMPT": ("Enter a NetApp transport type"),
"OPTION_LIST": ["http", "https"],
{"CMD_OPTION": "manila-netapp-driver-handles-share-servers",
"PROMPT": ("Enter whether the driver handles share servers"),
"OPTION_LIST": ["true", "false"],
"VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "http",
"DEFAULT_VALUE": "false",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_NAS_TRANSPORT_TYPE",
"CONF_NAME": "CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-nas-login",
{"CMD_OPTION": "manila-netapp-transport-type",
"PROMPT": ("Enter a NetApp transport type"),
"OPTION_LIST": ["http", "https"],
"VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "https",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_TRANSPORT_TYPE",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-login",
"PROMPT": ("Enter a NetApp login"),
"OPTION_LIST": [""],
"VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": "admin",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_NAS_LOGIN",
"CONF_NAME": "CONFIG_MANILA_NETAPP_LOGIN",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-nas-password",
{"CMD_OPTION": "manila-netapp-password",
"PROMPT": ("Enter a NetApp password"),
"OPTION_LIST": [""],
"VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": "",
"MASK_INPUT": True,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_NAS_PASSWORD",
"CONF_NAME": "CONFIG_MANILA_NETAPP_PASSWORD",
"USE_DEFAULT": False,
"NEED_CONFIRM": True,
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-nas-server-hostname",
{"CMD_OPTION": "manila-netapp-server-hostname",
"PROMPT": ("Enter a NetApp hostname"),
"OPTION_LIST": [],
"VALIDATORS": [validators.validate_not_empty],
"PROCESSORS": [processors.process_add_quotes_around_values],
"PROCESSORS": [],
"DEFAULT_VALUE": "",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_NAS_SERVER_HOSTNAME",
"CONF_NAME": "CONFIG_MANILA_NETAPP_SERVER_HOSTNAME",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-storage-family",
"PROMPT": ("Enter a NetApp storage family"),
"OPTION_LIST": ['ontap_cluster'],
"VALIDATORS": [validators.validate_options],
"PROCESSORS": [],
"DEFAULT_VALUE": "ontap_cluster",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_STORAGE_FAMILY",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-server-port",
"PROMPT": ("Enter a NetApp server port"),
"OPTION_LIST": [],
"VALIDATORS": [],
"PROCESSORS": [],
"DEFAULT_VALUE": "443",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_SERVER_PORT",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
@@ -136,7 +174,9 @@ def initConfig(controller):
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
],
"MANILANETAPPMULTISVM": [
{"CMD_OPTION": "manila-netapp-root-volume-aggregate",
"PROMPT": ("Enter a NetApp root volume aggregate"),
"OPTION_LIST": [],
@@ -150,7 +190,7 @@ def initConfig(controller):
"CONDITION": False},
{"CMD_OPTION": "manila-netapp-root-volume-name",
"PROMPT": ("Enter a NetApp root volume name"),
"PROMPT": ("Enter a NetApp root volume name."),
"OPTION_LIST": [],
"VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": "root",
@@ -162,7 +202,38 @@ def initConfig(controller):
"CONDITION": False},
],
"MANILANETAPPSINGLESVM": [
{"CMD_OPTION": "manila-netapp-vserver",
"PROMPT": ("Enter a NetApp Vserver"),
"OPTION_LIST": [],
"VALIDATORS": [validators.validate_not_empty],
"PROCESSORS": [],
"DEFAULT_VALUE": "",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_NETAPP_VSERVER",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
],
"MANILAGENERIC": [
{"CMD_OPTION": "manila-generic-driver-handles-share-servers",
"USAGE": ("Denotes whether the driver should handle the "
"responsibility of managing share servers. This must be "
"set to false if the driver is to operate without "
"managing share servers."),
"PROMPT": ("Enter whether the driver handles share servers"),
"OPTION_LIST": ["true", "false"],
"VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": "true",
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_MANILA_GENERIC_DRV_HANDLES_SHARE_SERVERS",
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "manila-generic-volume-name-template",
"PROMPT": ("Enter a volume name template"),
"OPTION_LIST": [],
@@ -241,6 +312,20 @@ def initConfig(controller):
"POST_CONDITION": False,
"POST_CONDITION_MATCH": True},
{"GROUP_NAME": "MANILANETAPPMULTISVM",
"DESCRIPTION": "Manila NetApp multi-SVM configuration",
"PRE_CONDITION": check_netapp_options_multi_svm,
"PRE_CONDITION_MATCH": True,
"POST_CONDITION": False,
"POST_CONDITION_MATCH": True},
{"GROUP_NAME": "MANILANETAPPSINGLESVM",
"DESCRIPTION": "Manila NetApp single-SVM configuration",
"PRE_CONDITION": check_netapp_options_single_svm,
"PRE_CONDITION_MATCH": True,
"POST_CONDITION": False,
"POST_CONDITION_MATCH": True},
{"GROUP_NAME": "MANILAGENERIC",
"DESCRIPTION": "Manila generic driver configuration",
"PRE_CONDITION": check_generic_options,
@@ -275,13 +360,25 @@ def initSequences(controller):
# ------------------------- helper functions -------------------------
def check_netapp_options(config):
return (config.get('CONFIG_MANILA_INSTALL', 'n') == 'y' and
config.get('CONFIG_MANILA_BACKEND', 'generic') == 'netapp')
return (config['CONFIG_MANILA_INSTALL'] == 'y' and
'netapp' in config['CONFIG_MANILA_BACKEND'])
def check_netapp_options_multi_svm(config):
key_name = 'CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS'
return (check_netapp_options(config) and
config[key_name] == "true")
def check_netapp_options_single_svm(config):
key_name = 'CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS'
return (check_netapp_options(config) and
config[key_name] == "false")
def check_generic_options(config):
return (config.get('CONFIG_MANILA_INSTALL', 'n') == 'y' and
config.get('CONFIG_MANILA_BACKEND', 'generic') == 'generic')
return (config['CONFIG_MANILA_INSTALL'] == 'y' and
'generic' in config['CONFIG_MANILA_BACKEND'])
# -------------------------- step functions --------------------------
@@ -299,6 +396,16 @@ def create_manifest(config, messages):
if config['CONFIG_UNSUPPORTED'] != 'y':
config['CONFIG_STORAGE_HOST'] = config['CONFIG_CONTROLLER_HOST']
# Change these from text to Boolean values
boolean_keys = ['CONFIG_MANILA_GENERIC_DRV_HANDLES_SHARE_SERVERS',
'CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS']
for key in [k for k in boolean_keys if k in config]:
if config[key].lower() == "true":
config[key] = True
elif config[key].lower() == "false":
config[key] = False
manifestdata = getManifestTemplate(get_mq(config, "manila"))
manifestfile = "%s_manila.pp" % config['CONFIG_STORAGE_HOST']
manifestdata += getManifestTemplate("manila.pp")

5
packstack/puppet/templates/manila_generic.pp
View File

@@ -2,8 +2,9 @@
package { 'nfs-utils': ensure => present }
manila::backend::generic{ 'generic':
volume_name_template => hiera('CONFIG_MANILA_GENERIC_VOLUME_NAME_TEMPLATE'),
share_mount_path => hiera('CONFIG_MANILA_GENERIC_SHARE_MOUNT_PATH'),
driver_handles_share_servers => hiera('CONFIG_MANILA_GENERIC_DRV_HANDLES_SHARE_SERVERS'),
volume_name_template => hiera('CONFIG_MANILA_GENERIC_VOLUME_NAME_TEMPLATE'),
share_mount_path => hiera('CONFIG_MANILA_GENERIC_SHARE_MOUNT_PATH'),
}
manila::service_instance{ 'generic':

16
packstack/puppet/templates/manila_netapp.pp
View File

@@ -1,10 +1,14 @@
manila::backend::netapp{ 'netapp':
netapp_nas_transport_type => hiera('CONFIG_MANILA_NETAPP_NAS_TRANSPORT_TYPE'),
netapp_nas_login => hiera('CONFIG_MANILA_NETAPP_NAS_LOGIN'),
netapp_nas_password => hiera('CONFIG_MANILA_NETAPP_NAS_PASSWORD'),
netapp_nas_server_hostname => hiera('CONFIG_MANILA_NETAPP_NAS_SERVER_HOSTNAME'),
driver_handles_share_servers => hiera('CONFIG_MANILA_NETAPP_DRV_HANDLES_SHARE_SERVERS'),
netapp_transport_type => hiera('CONFIG_MANILA_NETAPP_TRANSPORT_TYPE'),
netapp_login => hiera('CONFIG_MANILA_NETAPP_LOGIN'),
netapp_password => hiera('CONFIG_MANILA_NETAPP_PASSWORD'),
netapp_server_hostname => hiera('CONFIG_MANILA_NETAPP_SERVER_HOSTNAME'),
netapp_storage_family => hiera('CONFIG_MANILA_NETAPP_STORAGE_FAMILY'),
netapp_server_port => hiera('CONFIG_MANILA_NETAPP_SERVER_PORT'),
netapp_vserver => hiera('CONFIG_MANILA_NETAPP_VSERVER', undef),
netapp_aggregate_name_search_pattern => hiera('CONFIG_MANILA_NETAPP_AGGREGATE_NAME_SEARCH_PATTERN'),
netapp_root_volume_aggregate => hiera('CONFIG_MANILA_NETAPP_ROOT_VOLUME_AGGREGATE'),
netapp_root_volume_name => hiera('CONFIG_MANILA_NETAPP_ROOT_VOLUME_NAME'),
netapp_root_volume_aggregate => hiera('CONFIG_MANILA_NETAPP_ROOT_VOLUME_AGGREGATE', undef),
netapp_root_volume_name => hiera('CONFIG_MANILA_NETAPP_ROOT_VOLUME_NAME', undef),
}