Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos.package
Commits
f1b623c2
Commit
f1b623c2
authored
Jun 29, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
not one_disk -> second_disk
parent
901875e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
slapprepare/slapprepare/slapprepare.py
slapprepare/slapprepare/slapprepare.py
+4
-4
No files found.
slapprepare/slapprepare/slapprepare.py
View file @
f1b623c2
...
@@ -303,7 +303,7 @@ def slapserver(config):
...
@@ -303,7 +303,7 @@ def slapserver(config):
open
(
os
.
path
.
join
(
config
.
slapos_configuration
,
'SlapContainer-needed'
),
'w'
)
open
(
os
.
path
.
join
(
config
.
slapos_configuration
,
'SlapContainer-needed'
),
'w'
)
# Adding slapos_firstboot in case of MultiDisk usage
# Adding slapos_firstboot in case of MultiDisk usage
if
not
config
.
one
_disk
:
if
config
.
second
_disk
:
for
script
in
[
'slapos_firstboot'
]:
for
script
in
[
'slapos_firstboot'
]:
path
=
os
.
path
.
join
(
mount_dir_path
,
'etc'
,
'init.d'
,
script
)
path
=
os
.
path
.
join
(
mount_dir_path
,
'etc'
,
'init.d'
,
script
)
print
"Creating %r"
%
path
print
"Creating %r"
%
path
...
@@ -451,7 +451,7 @@ class Config:
...
@@ -451,7 +451,7 @@ class Config:
print
"Starting from scratch..."
print
"Starting from scratch..."
return
False
return
False
self
.
one_disk
=
not
get_yes_no
(
"Do you want to use SlapOS with a second disk?"
,
True
)
self
.
second_disk
=
get_yes_no
(
"Do you want to use SlapOS with a second disk?"
,
True
)
self
.
need_bridge
=
get_yes_no
(
"Do you want the setup to allow virtual machines inside this node?"
,
True
)
self
.
need_bridge
=
get_yes_no
(
"Do you want the setup to allow virtual machines inside this node?"
,
True
)
self
.
force_vpn
=
get_yes_no
(
"Do you want to use vpn to provide ipv6?"
,
True
)
self
.
force_vpn
=
get_yes_no
(
"Do you want to use vpn to provide ipv6?"
,
True
)
...
@@ -477,7 +477,7 @@ class Config:
...
@@ -477,7 +477,7 @@ class Config:
print
"Ipv6 over VPN: %s"
%
self
.
force_vpn
print
"Ipv6 over VPN: %s"
%
self
.
force_vpn
print
"Remote ssh access: %s"
%
self
.
need_ssh
print
"Remote ssh access: %s"
%
self
.
need_ssh
print
"Prepared to use lxc: %s"
%
self
.
force_slapcontainer
print
"Prepared to use lxc: %s"
%
self
.
force_slapcontainer
print
"Use a second disk: %s"
%
(
not
self
.
one_disk
)
print
"Use a second disk: %s"
%
self
.
second_disk
def
prepare_from_scratch
(
config
):
def
prepare_from_scratch
(
config
):
...
@@ -551,7 +551,7 @@ def prepare_from_scratch(config):
...
@@ -551,7 +551,7 @@ def prepare_from_scratch(config):
slapserver
(
config
)
slapserver
(
config
)
if
not
config
.
one
_disk
:
if
config
.
second
_disk
:
_call
([
'/etc/init.d/slapos_firstboot'
])
_call
([
'/etc/init.d/slapos_firstboot'
])
_call
([
'zypper'
,
'--gpg-auto-import-keys'
,
'install'
,
'-fy'
,
'slapos.node'
])
_call
([
'zypper'
,
'--gpg-auto-import-keys'
,
'install'
,
'-fy'
,
'slapos.node'
])
_call
([
'systemctl'
,
'stop'
,
'slapos-node.service'
])
_call
([
'systemctl'
,
'stop'
,
'slapos-node.service'
])
...
...
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