Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.core
Commits
5b550fad
Commit
5b550fad
authored
Nov 03, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos.cli.configure_local: Get template locally instead do an http request.
parent
96963291
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
slapos/cli/configure_client.py
slapos/cli/configure_client.py
+4
-5
No files found.
slapos/cli/configure_client.py
View file @
5b550fad
...
@@ -87,11 +87,10 @@ def get_certificate_key_pair(logger, master_url_web, token):
...
@@ -87,11 +87,10 @@ def get_certificate_key_pair(logger, master_url_web, token):
return
json_dict
[
"certificate"
],
json_dict
[
"key"
]
return
json_dict
[
"certificate"
],
json_dict
[
"key"
]
def
fetch_configuration_template
():
def
fetch_configuration_template
():
# XXX: change to local version.
template_path
=
os
.
path
.
join
(
"/"
.
join
(
__file__
.
split
(
'/'
)[:
-
2
]),
'slapos-client.cfg.example'
)
req
=
requests
.
get
(
'http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos-client.cfg.example'
)
with
open
(
template_path
,
'r'
)
as
fout
:
req
.
raise_for_status
()
slapos_node_configuration_template
=
fout
.
read
()
return
req
.
text
return
slapos_node_configuration_template
def
do_configure_client
(
logger
,
master_url_web
,
token
,
config_path
,
master_url
):
def
do_configure_client
(
logger
,
master_url_web
,
token
,
config_path
,
master_url
):
while
not
token
:
while
not
token
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment