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
Labels
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
00d5fa49
Commit
00d5fa49
authored
Jun 25, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
node register: use logging
parent
93f77978
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
16 deletions
+12
-16
slapos/register/register.py
slapos/register/register.py
+12
-16
No files found.
slapos/register/register.py
View file @
00d5fa49
...
@@ -98,22 +98,18 @@ def get_computer_name(certificate):
...
@@ -98,22 +98,18 @@ def get_computer_name(certificate):
def
save_former_config
(
conf
):
def
save_former_config
(
conf
):
"""Save former configuration if found"""
"""Save former configuration if found"""
# Check for config file in /etc/opt/slapos/
if
os
.
path
.
exists
(
'/etc/opt/slapos/slapos.cfg'
):
former
=
'/etc/opt/slapos'
former
=
'/etc/opt/slapos'
else
:
if
not
os
.
path
.
exists
(
os
.
path
.
join
(
former
,
'slapos.cfg'
))
:
return
return
saved
=
former
+
'.old'
saved
=
former
+
'.old'
while
True
:
while
os
.
path
.
exists
(
saved
):
if
os
.
path
.
exists
(
saved
):
conf
.
logger
.
info
(
'Slapos configuration detected in %s'
,
saved
)
print
"Slapos configuration detected in %s"
%
saved
if
saved
[
-
1
]
==
'd'
:
if
saved
[
-
1
]
!=
'd'
:
saved
=
saved
[:
-
1
]
+
str
(
int
(
saved
[
-
1
])
+
1
)
else
:
saved
+=
'.1'
saved
+=
'.1'
else
:
else
:
break
# XXX this goes from 19 to 110
saved
=
saved
[:
-
1
]
+
str
(
int
(
saved
[
-
1
])
+
1
)
conf
.
logger
.
info
(
'Former slapos configuration detected '
conf
.
logger
.
info
(
'Former slapos configuration detected '
'in %s moving to %s'
,
former
,
saved
)
'in %s moving to %s'
,
former
,
saved
)
shutil
.
move
(
former
,
saved
)
shutil
.
move
(
former
,
saved
)
...
@@ -292,15 +288,15 @@ def do_register(conf):
...
@@ -292,15 +288,15 @@ def do_register(conf):
# Prepare Slapos Configuration
# Prepare Slapos Configuration
slapconfig
(
conf
)
slapconfig
(
conf
)
print
"Node has successfully been configured as %s."
%
COMP
conf
.
logger
.
info
(
'Node has successfully been configured as %s.'
,
COMP
)
# XXX hardcoded value, relying on package installation
# XXX hardcoded value, relying on package installation
# We shall fix that later
# We shall fix that later
print
"Running starting script"
conf
.
logger
.
info
(
'Running starting script'
)
if
os
.
path
.
isfile
(
"/usr/sbin/slapos-start"
):
if
os
.
path
.
isfile
(
"/usr/sbin/slapos-start"
):
try
:
try
:
subprocess
.
check_call
(
"/usr/sbin/slapos-start"
)
subprocess
.
check_call
(
"/usr/sbin/slapos-start"
)
except
CalledProcessError
:
except
CalledProcessError
:
print
"Error while trying to run /usr/sbin/slapos-start"
conf
.
logger
.
error
(
'Error while trying to run /usr/sbin/slapos-start'
)
else
:
else
:
print
"Missing file /usr/sbin/slapos-start"
conf
.
logger
.
warning
(
'Missing file /usr/sbin/slapos-start'
)
return
0
return
0
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