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
Iliya Manolov
slapos
Commits
f2faee5c
Commit
f2faee5c
authored
Aug 11, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner-resilient: default number of backup instances is now 1
parent
ec702518
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-resilient-test.cfg.jinja2
software/slaprunner/instance-resilient-test.cfg.jinja2
+1
-0
software/slaprunner/instance-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+2
-2
software/slaprunner/schema.json
software/slaprunner/schema.json
+1
-1
No files found.
software/slaprunner/common.cfg
View file @
f2faee5c
...
@@ -80,7 +80,7 @@ mode = 0644
...
@@ -80,7 +80,7 @@ mode = 0644
[template-resilient]
[template-resilient]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
md5sum =
f3d1dfbe2ef89bc14ef688b9ce23fbe5
md5sum =
1f7332d0b0671929a2de87ef9ce998c8
filename = instance-resilient.cfg.jinja2
filename = instance-resilient.cfg.jinja2
mode = 0644
mode = 0644
...
@@ -88,7 +88,7 @@ mode = 0644
...
@@ -88,7 +88,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
download-only = true
download-only = true
md5sum =
07241952e1dce8688b2da5c1a14c3e6a
md5sum =
abba49f5f397bfe6f6ea5e5dd185b1e9
filename = instance-resilient-test.cfg.jinja2
filename = instance-resilient-test.cfg.jinja2
mode = 0644
mode = 0644
...
...
software/slaprunner/instance-resilient-test.cfg.jinja2
View file @
f2faee5c
...
@@ -47,6 +47,7 @@ config = resiliency-backup-periodicity {{ cluster_parameter_dict.keys() | join('
...
@@ -47,6 +47,7 @@ config = resiliency-backup-periodicity {{ cluster_parameter_dict.keys() | join('
config-{{ key }} = {{ dumps(value) }}
config-{{ key }} = {{ dumps(value) }}
{% endfor -%}
{% endfor -%}
config-resiliency-backup-periodicity = */6 * * * *
config-resiliency-backup-periodicity = */6 * * * *
config-resilient-clone-number = 2
# XXX hardcoded
# XXX hardcoded
#config-frontend-domain = google.com
#config-frontend-domain = google.com
# XXX Hack to deploy Root Instance on the same computer as the type-test Instance
# XXX Hack to deploy Root Instance on the same computer as the type-test Instance
...
...
software/slaprunner/instance-resilient.cfg.jinja2
View file @
f2faee5c
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
{% do slapparameter_dict.__setitem__('auto-deploy', slapparameter_dict.get('auto-deploy', 'true')) %}
{% do slapparameter_dict.__setitem__('auto-deploy', slapparameter_dict.get('auto-deploy', 'true')) %}
{% do slapparameter_dict.__setitem__('auto-deploy-instance', slapparameter_dict.get('auto-deploy-instance', 'false')) %}
{% do slapparameter_dict.__setitem__('auto-deploy-instance', slapparameter_dict.get('auto-deploy-instance', 'false')) %}
# let decide the number of clones we want. We can't have more than 2 clones
# let decide the number of clones we want. We can't have more than 2 clones
{% set number_of_instances = slapparameter_dict.get('resilient-clone-number',
2
)|int %}
{% set number_of_instances = slapparameter_dict.get('resilient-clone-number',
1
)|int %}
{% if number_of_instances > 2 %}
{% if number_of_instances > 2 %}
{% set number_of_instances = 2 %}
{% set number_of_instances = 2 %}
{% endif %}
{% endif %}
...
@@ -55,4 +55,4 @@ domain =
...
@@ -55,4 +55,4 @@ domain =
authorized-key =
authorized-key =
instance-amount = 10
instance-amount = 10
debug = false
debug = false
resilient-clone-number =
2
resilient-clone-number =
1
software/slaprunner/schema.json
View file @
f2faee5c
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
"resilient-clone-number"
:
{
"resilient-clone-number"
:
{
"description"
:
"is the number of clones to be deployed when a resilient runner is ordered. Its value can be 1 or 2"
,
"description"
:
"is the number of clones to be deployed when a resilient runner is ordered. Its value can be 1 or 2"
,
"type"
:
"integer"
,
"type"
:
"integer"
,
"default"
:
2
"default"
:
1
}
}
}
}
}
}
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