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
Boxiang Sun
slapos.core
Commits
9d9b3680
Commit
9d9b3680
authored
Jul 17, 2018
by
Rafael Monnerat
👻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip: Create shared_software_root folders
parent
b9f401ba
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
slapos/format.py
slapos/format.py
+8
-2
No files found.
slapos/format.py
View file @
9d9b3680
...
@@ -248,7 +248,7 @@ class Computer(object):
...
@@ -248,7 +248,7 @@ class Computer(object):
ipv6_interface
=
None
,
software_user
=
'slapsoft'
,
ipv6_interface
=
None
,
software_user
=
'slapsoft'
,
tap_gateway_interface
=
None
,
tap_gateway_interface
=
None
,
instance_root
=
None
,
software_root
=
None
,
instance_storage_home
=
None
,
instance_root
=
None
,
software_root
=
None
,
instance_storage_home
=
None
,
partition_list
=
None
,
config
=
None
):
shared_software_root
=
None
,
partition_list
=
None
,
config
=
None
):
"""
"""
Attributes:
Attributes:
reference: str, the reference of the computer.
reference: str, the reference of the computer.
...
@@ -270,6 +270,7 @@ class Computer(object):
...
@@ -270,6 +270,7 @@ class Computer(object):
"Computer's instance_root and software_root must not be empty!"
"Computer's instance_root and software_root must not be empty!"
self
.
software_root
=
software_root
self
.
software_root
=
software_root
self
.
instance_root
=
instance_root
self
.
instance_root
=
instance_root
self
.
shared_software_root
=
shared_software_root
self
.
instance_storage_home
=
instance_storage_home
self
.
instance_storage_home
=
instance_storage_home
# The following properties are updated on update() method
# The following properties are updated on update() method
...
@@ -540,7 +541,12 @@ class Computer(object):
...
@@ -540,7 +541,12 @@ class Computer(object):
network_interface_name
=
self
.
interface
.
name
network_interface_name
=
self
.
interface
.
name
self
.
_addUniqueLocalAddressIpv6
(
network_interface_name
)
self
.
_addUniqueLocalAddressIpv6
(
network_interface_name
)
for
path
in
self
.
instance_root
,
self
.
software_root
:
path_list
=
[
self
.
instance_root
,
self
.
software_root
]
if
self
.
shared_software_root
is
not
None
:
path_list
.
extend
(
self
.
shared_software_root
.
split
(
","
)]
for
path
in
path_list
:
if
not
os
.
path
.
exists
(
path
):
if
not
os
.
path
.
exists
(
path
):
os
.
makedirs
(
path
,
0o755
)
os
.
makedirs
(
path
,
0o755
)
else
:
else
:
...
...
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