diff --git a/packstack/installer/validators.py b/packstack/installer/validators.py index 35dd4fc6b..65f9a56b5 100644 --- a/packstack/installer/validators.py +++ b/packstack/installer/validators.py @@ -157,7 +157,7 @@ def validate_multi_ip(param, options=None): parameter value are in IPv4 or IPv6 aformat. """ for host in param.split(','): - host, device = host.split('/', 1) + host = host.split('/', 1)[0] validate_ip(host.strip(), options) diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py index 44280045d..31128d389 100644 --- a/packstack/plugins/swift_600.py +++ b/packstack/plugins/swift_600.py @@ -27,14 +27,14 @@ def initConfig(controllerObject): logging.debug("Adding OpenStack Swift configuration") paramsList = [ {"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", "OPTION_LIST" : [], - "VALIDATORS" : [validators.validate_ip, validators.validate_ssh], + "VALIDATORS" : [validators.validate_multi_ip, validators.validate_multi_ssh], "DEFAULT_VALUE" : utils.get_localhost_ip(), "MASK_INPUT" : False, "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, "NEED_CONFIRM" : False, "CONDITION" : False },