From 5c2c5d1493606c74b069de6dda11c31bf6714f74 Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Wed, 25 Jan 2017 17:10:10 +0100 Subject: [PATCH] Fix passing TLS_VERIFIED in clusters/bays_shell Instead of printing a JSON we need to print the env vars. Change-Id: I154e198ae369569cf3b905cf4c1885a0a3ee6979 Closes-Bug: #1659337 --- magnumclient/v1/bays_shell.py | 11 +++-------- magnumclient/v1/clusters_shell.py | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/magnumclient/v1/bays_shell.py b/magnumclient/v1/bays_shell.py index 0836bcd..c6d274e 100644 --- a/magnumclient/v1/bays_shell.py +++ b/magnumclient/v1/bays_shell.py @@ -322,16 +322,14 @@ def _config_bay_kubernetes(bay, baymodel, cfg_dir, force=False): def _config_bay_swarm(bay, baymodel, cfg_dir, force=False): """Return and write configuration for the given swarm bay.""" + tls = "" if baymodel.tls_disabled else True if 'csh' in os.environ['SHELL']: result = ("setenv DOCKER_HOST %(docker_host)s\n" "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} + 'tls': tls} ) else: result = ("export DOCKER_HOST=%(docker_host)s\n" @@ -339,10 +337,7 @@ def _config_bay_swarm(bay, baymodel, cfg_dir, force=False): "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} + 'tls': tls} ) return result diff --git a/magnumclient/v1/clusters_shell.py b/magnumclient/v1/clusters_shell.py index d96ec26..61e921a 100644 --- a/magnumclient/v1/clusters_shell.py +++ b/magnumclient/v1/clusters_shell.py @@ -327,16 +327,14 @@ def _config_cluster_kubernetes(cluster, cluster_template, def _config_cluster_swarm(cluster, cluster_template, cfg_dir, force=False): """Return and write configuration for the given swarm cluster.""" + tls = "" if cluster_template.tls_disabled else True if 'csh' in os.environ['SHELL']: result = ("setenv DOCKER_HOST %(docker_host)s\n" "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} + 'tls': tls} ) else: result = ("export DOCKER_HOST=%(docker_host)s\n" @@ -344,10 +342,7 @@ def _config_cluster_swarm(cluster, cluster_template, cfg_dir, force=False): "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} + 'tls': tls} ) return result