Fix: swarm cluster-config, bay-config with tls_disabled
magnum cluster-config, bay-config for swarm cluster didn't work with tls_disabled. With this patch following is done:- if tls_disabled then set DOCKER_TLS_VERIFY="" if not tls_disabled then set DOCKER_TLS_VERIFY=True Change-Id: I57eb1d49b5157958f9c5f6d89a613896300fdb6e Closes-Bug: #1647254
This commit is contained in:
parent
63398c2751
commit
b62cad113a
@ -302,6 +302,9 @@ def _config_bay_swarm(bay, baymodel, cfg_dir, force=False):
|
||||
"setenv DOCKER_CERT_PATH %(cfg_dir)s\n"
|
||||
"setenv DOCKER_TLS_VERIFY %(tls)s\n"
|
||||
% {'docker_host': bay.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': ""} if baymodel.tls_disabled else
|
||||
{'docker_host': bay.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': not baymodel.tls_disabled}
|
||||
)
|
||||
@ -310,6 +313,9 @@ def _config_bay_swarm(bay, baymodel, cfg_dir, force=False):
|
||||
"export DOCKER_CERT_PATH=%(cfg_dir)s\n"
|
||||
"export DOCKER_TLS_VERIFY=%(tls)s\n"
|
||||
% {'docker_host': bay.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': ""} if baymodel.tls_disabled else
|
||||
{'docker_host': bay.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': not baymodel.tls_disabled}
|
||||
)
|
||||
|
@ -297,6 +297,9 @@ def _config_cluster_swarm(cluster, cluster_template, cfg_dir='.', force=False):
|
||||
"setenv DOCKER_CERT_PATH %(cfg_dir)s\n"
|
||||
"setenv DOCKER_TLS_VERIFY %(tls)s\n"
|
||||
% {'docker_host': cluster.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': ""} if cluster_template.tls_disabled else
|
||||
{'docker_host': cluster.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': not cluster_template.tls_disabled}
|
||||
)
|
||||
@ -305,6 +308,9 @@ def _config_cluster_swarm(cluster, cluster_template, cfg_dir='.', force=False):
|
||||
"export DOCKER_CERT_PATH=%(cfg_dir)s\n"
|
||||
"export DOCKER_TLS_VERIFY=%(tls)s\n"
|
||||
% {'docker_host': cluster.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': ""} if cluster_template.tls_disabled else
|
||||
{'docker_host': cluster.api_address,
|
||||
'cfg_dir': cfg_dir,
|
||||
'tls': not cluster_template.tls_disabled}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user