Merge "fix wrong format of NO_PROXY in temp configuration file"

This commit is contained in:
Zuul 2019-02-14 17:00:56 +00:00 committed by Gerrit Code Review
commit 4abb322fb0
1 changed files with 3 additions and 2 deletions

View File

@ -999,8 +999,9 @@ class ConfigValidator(object):
# check no_proxy
if self.conf.has_option('DOCKER_PROXY', 'DOCKER_NO_PROXY'):
docker_no_proxy_list_str = self.conf.get(
'DOCKER_PROXY', 'DOCKER_NO_PROXY').split(',')
for no_proxy_str in docker_no_proxy_list_str:
'DOCKER_PROXY', 'DOCKER_NO_PROXY')
docker_no_proxy_list = docker_no_proxy_list_str.split(',')
for no_proxy_str in docker_no_proxy_list:
if not is_valid_domain_or_ip(no_proxy_str):
raise ConfigFail(
"Invalid DOCKER_NO_PROXY value of %s." %