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
Léo-Paul Géneau
slapos.core
Commits
c81eb3ea
Commit
c81eb3ea
authored
Oct 26, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tap-nobridge'
parents
fc6c6ee8
658d48dd
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
333 additions
and
123 deletions
+333
-123
slapos/grid/SlapObject.py
slapos/grid/SlapObject.py
+4
-0
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+127
-72
slapos/tests/slapgrid.py
slapos/tests/slapgrid.py
+202
-51
No files found.
slapos/grid/SlapObject.py
View file @
c81eb3ea
...
@@ -333,6 +333,7 @@ class Partition(object):
...
@@ -333,6 +333,7 @@ class Partition(object):
"""
"""
retention_lock_delay_filename
=
'.slapos-retention-lock-delay'
retention_lock_delay_filename
=
'.slapos-retention-lock-delay'
retention_lock_date_filename
=
'.slapos-retention-lock-date'
retention_lock_date_filename
=
'.slapos-retention-lock-date'
partition_firewall_rules_name
=
'.slapos-firewalld-rules'
# XXX: we should give the url (or the "key") instead of the software_path
# XXX: we should give the url (or the "key") instead of the software_path
# then compute the path from it, like in Software.
# then compute the path from it, like in Software.
...
@@ -394,6 +395,9 @@ class Partition(object):
...
@@ -394,6 +395,9 @@ class Partition(object):
self
.
retention_lock_date_file_path
=
os
.
path
.
join
(
self
.
retention_lock_date_file_path
=
os
.
path
.
join
(
self
.
instance_path
,
self
.
retention_lock_date_filename
self
.
instance_path
,
self
.
retention_lock_date_filename
)
)
self
.
firewall_rules_path
=
os
.
path
.
join
(
self
.
instance_path
,
self
.
partition_firewall_rules_name
)
self
.
instance_min_free_space
=
instance_min_free_space
self
.
instance_min_free_space
=
instance_min_free_space
...
...
slapos/grid/slapgrid.py
View file @
c81eb3ea
This diff is collapsed.
Click to expand it.
slapos/tests/slapgrid.py
View file @
c81eb3ea
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