openstack/python-magnumclient
Code Issues Proposed changes

bay-config return absolute path

Browse Source 
Currently bay-config returns relative path. In case current
working directory is changed then relative path will not work.
Changes has been made to return absolute path. Which solve the
problem introduced by relative path.

Change-Id: I66174efa08ebe33210feb603a3fa36f396add575
Closes-bug: #1614682
This commit is contained in:
Rajiv Kumar 2016-08-22 10:50:15 +05:30
parent 4761fdf94a
commit 5fd459ec62
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnumclient/v1/bays_shell.py
View File

@ -188,6 +188,7 @@ def do_bay_config(cs, args):
Example: eval $(magnum bay-config <bay-name>).
"""
args.dir = os.path.abspath(args.dir)
bay = cs.bays.get(args.bay)
if bay.status not in ('CREATE_COMPLETE', 'UPDATE_COMPLETE'):
raise exceptions.CommandError("Bay in status %s" % bay.status)
@ -213,7 +214,7 @@ def do_bay_config(cs, args):
print(_config_bay(bay, baymodel, cfg_dir=args.dir, force=args.force))
def _config_bay(bay, baymodel, cfg_dir='.', force=False):
def _config_bay(bay, baymodel, cfg_dir, force=False):
"""Return and write configuration for the given bay."""
if baymodel.coe == 'kubernetes':
return _config_bay_kubernetes(bay, baymodel, cfg_dir, force)
@ -221,7 +222,7 @@ def _config_bay(bay, baymodel, cfg_dir='.', force=False):
return _config_bay_swarm(bay, baymodel, cfg_dir, force)
def _config_bay_kubernetes(bay, baymodel, cfg_dir='.', force=False):
def _config_bay_kubernetes(bay, baymodel, cfg_dir, force=False):
"""Return and write configuration for the given kubernetes bay."""
cfg_file = "%s/config" % cfg_dir
if baymodel.tls_disabled:
@ -275,7 +276,7 @@ def _config_bay_kubernetes(bay, baymodel, cfg_dir='.', force=False):
return "export KUBECONFIG=%s\n" % cfg_file
def _config_bay_swarm(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."""
if 'csh' in os.environ['SHELL']:
result = ("setenv DOCKER_HOST %(docker_host)s\n"