Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Lisa Casino
slapos.package
Commits
e56e090c
Commit
e56e090c
authored
11 years ago
by
Cédric de Saint Martin
Browse files
Options
Download
Email Patches
Plain Diff
State that it is not possible to continue without slapos configuration.
parent
f5fb3b53
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
5 deletions
+17
-5
slapprepare/slapprepare/slapprepare.py
slapprepare/slapprepare/slapprepare.py
+17
-5
No files found.
slapprepare/slapprepare/slapprepare.py
View file @
e56e090c
...
...
@@ -443,12 +443,22 @@ class Config:
def
userConfig
(
self
):
# XXX-Testme: test each possible scenario
already_configured
=
getSlaposConfiguration
()
self
.
certificates
=
get_yes_no
(
"Automatically register new computer to slapos.org?"
,
True
)
if
self
.
certificates
:
if
already_configured
:
if
not
get_yes_no
(
"A SlapOS Node configuration has been found. Do you want to overwrite it?"
,
False
):
print
"Okay, let's start from scratch."
return
False
self
.
computer_name
=
raw_input
(
"Define a unique name for this computer: "
)
self
.
partition_amount
=
raw_input
(
"""Number of SlapOS partitions for this computer? Default is 20 :"""
)
if
self
.
partition_amount
==
''
:
self
.
partition_amount
=
'20'
elif
not
already_configured
:
print
"No existing Node configuration has been found. please either automatically register or manually setup Node configuration."
print
"Starting from scratch..."
return
False
self
.
virtual
=
get_yes_no
(
"Is this a virtual Machine?"
,
False
)
if
not
self
.
virtual
:
...
...
@@ -466,6 +476,8 @@ class Config:
self
.
ipv6_interface
=
""
self
.
need_ssh
=
get_yes_no
(
"Do you want a remote ssh access?"
,
True
)
return
True
def
displayUserConfig
(
self
):
if
self
.
certificates
:
...
...
@@ -489,11 +501,11 @@ def prepare_from_scratch(config):
os
.
mkdir
(
temp_directory
,
0711
)
while
True
:
config
.
userConfig
()
print
"
\n
This is your configuration:
\n
"
config
.
displayUserConfig
()
if
get_yes_no
(
"
\n
Do you confirm?"
):
break
if
config
.
userConfig
()
:
print
"
\n
This is your configuration:
\n
"
config
.
displayUserConfig
()
if
get_yes_no
(
"
\n
Do you confirm?"
):
break
if
config
.
certificates
:
slapos_configuration
=
'/etc/opt/slapos/'
...
...
This diff is collapsed.
Click to expand it.
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