Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
slapos
Commits
caeeb035
Commit
caeeb035
authored
Nov 14, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into erp5testnode
parents
ea371c6f
1c80eea4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
5 deletions
+17
-5
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm-resilient-input-schema.json
software/kvm/instance-kvm-resilient-input-schema.json
+6
-0
software/kvm/instance-kvm-resilient.cfg.jinja2
software/kvm/instance-kvm-resilient.cfg.jinja2
+4
-2
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+1
-1
stack/resilient/pbsready-import.cfg.in
stack/resilient/pbsready-import.cfg.in
+4
-0
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
software/kvm/common.cfg
View file @
caeeb035
...
@@ -100,7 +100,7 @@ on-update = true
...
@@ -100,7 +100,7 @@ on-update = true
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
mode = 644
mode = 644
md5sum =
a07c96b53fe9145278cd64a3b27a459a
md5sum =
412d8540e054aa436bee723d85213a2b
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm-resilient-input-schema.json
View file @
caeeb035
...
@@ -34,6 +34,12 @@
...
@@ -34,6 +34,12 @@
"description"
:
"Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible."
,
"description"
:
"Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible."
,
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"3B"
"default"
:
"3B"
},
"resilient-clone-number"
:
{
"title"
:
"Amount of backup(s) to create"
,
"description"
:
"Amount of backup(s) to create. Each backup consists of a Pull Backup Server and a clone."
,
"type"
:
"integer"
,
"default"
:
2
}
}
}
}
}
}
...
...
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @
caeeb035
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
{% import 'parts' as parts %}
{% import 'parts' as parts %}
{% import 'replicated' as replicated with context %}
{% import 'replicated' as replicated with context %}
{% set backup_amount = slapparameter_dict.pop('resilient-clone-number', "1")|int + 1 -%}
[buildout]
[buildout]
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -10,12 +12,12 @@ offline = true
...
@@ -10,12 +12,12 @@ offline = true
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
parts +=
parts +=
{{ parts.replicate("kvm",
"3"
) }}
{{ parts.replicate("kvm",
backup_amount
) }}
publish-connection-informations
publish-connection-informations
kvm-frontend-url-promise
kvm-frontend-url-promise
kvm-backend-url-promise
kvm-backend-url-promise
{{ replicated.replicate("kvm",
"3"
, "kvm-export", "kvm-import", slapparameter_dict=slapparameter_dict) }}
{{ replicated.replicate("kvm",
backup_amount
, "kvm-export", "kvm-import", slapparameter_dict=slapparameter_dict) }}
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
...
stack/resilient/buildout.cfg
View file @
caeeb035
...
@@ -47,7 +47,7 @@ mode = 0644
...
@@ -47,7 +47,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
output = ${buildout:directory}/pbsready-import.cfg
md5sum =
0f953067aac3e0132f72fc7e1ed38bd4
md5sum =
a5570ecfeff7a9d1b5f8be08db4feefe
mode = 0644
mode = 0644
[pbsready-export]
[pbsready-export]
...
...
stack/resilient/pbsready-import.cfg.in
View file @
caeeb035
...
@@ -36,6 +36,10 @@ takeover-password = $${resilient-web-takeover-password:passwd}
...
@@ -36,6 +36,10 @@ takeover-password = $${resilient-web-takeover-password:passwd}
[dropbear-server]
[dropbear-server]
port = 22220
port = 22220
# Define port of notifier (same reason)
[notifier]
port = 65533
[import-on-notification]
[import-on-notification]
# notifier.callback runs a script when a notification (sent by a parent PBS)
# notifier.callback runs a script when a notification (sent by a parent PBS)
# is received
# is received
...
...
stack/slapos.cfg
View file @
caeeb035
...
@@ -123,7 +123,7 @@ pyparsing = 2.0.3
...
@@ -123,7 +123,7 @@ pyparsing = 2.0.3
setuptools = 7.0
setuptools = 7.0
six = 1.8.0
six = 1.8.0
slapos.cookbook = 0.87
slapos.cookbook = 0.87
slapos.core = 1.
2.4
.1
slapos.core = 1.
3
.1
slapos.libnetworkcache = 0.14.2
slapos.libnetworkcache = 0.14.2
slapos.recipe.build = 0.14
slapos.recipe.build = 0.14
slapos.recipe.cmmi = 0.2
slapos.recipe.cmmi = 0.2
...
...
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