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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
bc0a4167
Commit
bc0a4167
authored
Sep 21, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix getting option create_tun, fix test failing on cpuset_path
parent
86893227
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
slapos/format.py
slapos/format.py
+3
-1
slapos/manager/cpuset.py
slapos/manager/cpuset.py
+2
-2
No files found.
slapos/format.py
View file @
bc0a4167
...
@@ -468,7 +468,7 @@ class Computer(object):
...
@@ -468,7 +468,7 @@ class Computer(object):
user
=
user
,
user
=
user
,
address_list
=
address_list
,
address_list
=
address_list
,
tap
=
tap
,
tap
=
tap
,
tun
=
tun
if
conf
.
create_tun
else
None
,
tun
=
tun
if
conf
ig
.
create_tun
else
None
,
external_storage_list
=
external_storage_list
,
external_storage_list
=
external_storage_list
,
)
)
...
@@ -1516,6 +1516,8 @@ class FormatConfig(object):
...
@@ -1516,6 +1516,8 @@ class FormatConfig(object):
self
.
software_user
=
'slapsoft'
self
.
software_user
=
'slapsoft'
if
self
.
create_tap
is
None
:
if
self
.
create_tap
is
None
:
self
.
create_tap
=
True
self
.
create_tap
=
True
if
self
.
create_tun
is
None
:
self
.
create_tun
=
False
if
self
.
tap_gateway_interface
is
None
:
if
self
.
tap_gateway_interface
is
None
:
self
.
tap_gateway_interface
=
''
self
.
tap_gateway_interface
=
''
if
self
.
use_unique_local_address_block
is
None
:
if
self
.
use_unique_local_address_block
is
None
:
...
...
slapos/manager/cpuset.py
View file @
bc0a4167
...
@@ -41,7 +41,7 @@ class Manager(object):
...
@@ -41,7 +41,7 @@ class Manager(object):
- Those folders are "/sys/fs/cgroup/cpuset/cpu<N>".
- Those folders are "/sys/fs/cgroup/cpuset/cpu<N>".
"""
"""
if
not
os
.
path
.
exists
(
"/sys/fs/cgroup/cpuset/cpuset.cpus"
):
if
not
os
.
path
.
exists
(
os
.
path
.
join
(
self
.
cpuset_path
,
"cpuset.cpus"
)
):
logger
.
warning
(
"CPUSet Manager cannot format computer because cgroups do not exist."
)
logger
.
warning
(
"CPUSet Manager cannot format computer because cgroups do not exist."
)
return
return
...
...
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