openstack/python-magnumclient
Code Issues Proposed changes

Fix the generated k8s config file

Browse Source 
The bay-config command generated an incorrect file. This commit
fixed it.

Change-Id: I95563153d6494efe49a76d81ab48e68fc24be872
Closes-bug: #1626764
This commit is contained in:
Hongbin Lu
2016-09-22 17:11:10 -05:00
parent 9fa11267b1
commit 621be7cd73
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
magnumclient/v1/bays_shell.py
View File

@@ -246,13 +246,13 @@ def _config_bay_kubernetes(bay, baymodel, cfg_dir, force=False):
cfg_file = "%s/config" % cfg_dir
if baymodel.tls_disabled:
cfg = ("apiVersion: v1\n"
"bays:\n"
"- bay:\n"
"clusters:\n"
"- cluster:\n"
" server: %(api_address)s\n"
" name: %(name)s\n"
"contexts:\n"
"- context:\n"
" bay: %(name)s\n"
" cluster: %(name)s\n"
" user: %(name)s\n"
" name: default/%(name)s\n"
"current-context: default/%(name)s\n"
@@ -263,14 +263,14 @@ def _config_bay_kubernetes(bay, baymodel, cfg_dir, force=False):
% {'name': bay.name, 'api_address': bay.api_address})
else:
cfg = ("apiVersion: v1\n"
"bays:\n"
"- bay:\n"
"clusters:\n"
"- cluster:\n"
" certificate-authority: ca.pem\n"
" server: %(api_address)s\n"
" name: %(name)s\n"
"contexts:\n"
"- context:\n"
" bay: %(name)s\n"
" cluster: %(name)s\n"
" user: %(name)s\n"
" name: default/%(name)s\n"
"current-context: default/%(name)s\n"