x/packstack
Code Issues Proposed changes

Merge "Use multi validators in CONFIG_SWIFT_PROXY_HOSTS"

Browse Source
This commit is contained in:
Jenkins
2013-08-23 21:22:56 +00:00
committed by Gerrit Code Review
parent e6b5b87751 70b0f207b5
commit 43ec691759
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/installer/validators.py
View File

@@ -157,7 +157,7 @@ def validate_multi_ip(param, options=None):
parameter value are in IPv4 or IPv6 aformat. parameter value are in IPv4 or IPv6 aformat.
""" """
for host in param.split(','): for host in param.split(','):
host, device = host.split('/', 1) host = host.split('/', 1)[0]
validate_ip(host.strip(), options) validate_ip(host.strip(), options)

6
packstack/plugins/swift_600.py
View File

@@ -27,14 +27,14 @@ def initConfig(controllerObject):
logging.debug("Adding OpenStack Swift configuration") logging.debug("Adding OpenStack Swift configuration")
paramsList = [ paramsList = [
{"CMD_OPTION" : "os-swift-proxy", {"CMD_OPTION" : "os-swift-proxy",
"USAGE" : "The IP address on which to install the Swift proxy service", "USAGE" : "The IP address on which to install the Swift proxy service (currently only single proxy is supported)",
"PROMPT" : "Enter the IP address of the Swift proxy service", "PROMPT" : "Enter the IP address of the Swift proxy service",
"OPTION_LIST" : [], "OPTION_LIST" : [],
"VALIDATORS" : [validators.validate_ip, validators.validate_ssh], "VALIDATORS" : [validators.validate_multi_ip, validators.validate_multi_ssh],
"DEFAULT_VALUE" : utils.get_localhost_ip(), "DEFAULT_VALUE" : utils.get_localhost_ip(),
"MASK_INPUT" : False, "MASK_INPUT" : False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS", #XXX: Shouldn't be here CONFIG_SWIFT_PROXY_HOST? "CONF_NAME" : "CONFIG_SWIFT_PROXY_HOSTS",
"USE_DEFAULT" : False, "USE_DEFAULT" : False,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },