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
Roque
slapos
Commits
ad0562fc
Commit
ad0562fc
authored
Jul 07, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/resilient: drop ignore-known-hosts-file option
parent
f4dff95b
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2 additions
and
27 deletions
+2
-27
software/erp5testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2
...testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2
+0
-1
software/kvm/instance-kvm-resilient-input-schema.json
software/kvm/instance-kvm-resilient-input-schema.json
+0
-7
software/slaprunner/instance-runner-resilient-input-schema.json
...re/slaprunner/instance-runner-resilient-input-schema.json
+0
-7
software/theia/instance-resilient-input-schema.json
software/theia/instance-resilient-input-schema.json
+0
-7
stack/resilient/buildout.hash.cfg
stack/resilient/buildout.hash.cfg
+2
-2
stack/resilient/instance-pull-backup.cfg.in
stack/resilient/instance-pull-backup.cfg.in
+0
-1
stack/resilient/template-replicated.cfg.in
stack/resilient/template-replicated.cfg.in
+0
-2
No files found.
software/erp5testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2
View file @
ad0562fc
...
@@ -52,7 +52,6 @@ config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
...
@@ -52,7 +52,6 @@ config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped}
config-virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped}
config-resiliency-backup-periodicity = */5 * * * *
config-resiliency-backup-periodicity = */5 * * * *
config-resilient-clone-number = 1
config-resilient-clone-number = 1
config-ignore-known-hosts-file = false
return = ipv6
return = ipv6
# XXX What to do?
# XXX What to do?
sla-computer_guid = ${slap-connection:computer-id}
sla-computer_guid = ${slap-connection:computer-id}
...
...
software/kvm/instance-kvm-resilient-input-schema.json
View file @
ad0562fc
...
@@ -56,13 +56,6 @@
...
@@ -56,13 +56,6 @@
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"2W"
,
"default"
:
"2W"
,
"optional"
:
true
"optional"
:
true
},
"ignore-known-hosts-file"
:
{
"title"
:
"Ignore known_hosts file"
,
"description"
:
"Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner)."
,
"type"
:
"boolean"
,
"default"
:
false
,
"optional"
:
true
}
}
}
}
}
}
...
...
software/slaprunner/instance-runner-resilient-input-schema.json
View file @
ad0562fc
...
@@ -58,13 +58,6 @@
...
@@ -58,13 +58,6 @@
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"2W"
,
"default"
:
"2W"
,
"optional"
:
true
"optional"
:
true
},
"ignore-known-hosts-file"
:
{
"title"
:
"Ignore known_hosts file"
,
"description"
:
"Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner)."
,
"type"
:
"boolean"
,
"default"
:
false
,
"optional"
:
true
}
}
}
}
}
}
...
...
software/theia/instance-resilient-input-schema.json
View file @
ad0562fc
...
@@ -59,13 +59,6 @@
...
@@ -59,13 +59,6 @@
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"2W"
,
"default"
:
"2W"
,
"optional"
:
true
"optional"
:
true
},
"ignore-known-hosts-file"
:
{
"title"
:
"Ignore known_hosts file"
,
"description"
:
"Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, theia)."
,
"type"
:
"boolean"
,
"default"
:
false
,
"optional"
:
true
}
}
}
}
}
}
...
...
stack/resilient/buildout.hash.cfg
View file @
ad0562fc
...
@@ -26,11 +26,11 @@ md5sum = 2ef471242ab1fe9d0998f49304bfa066
...
@@ -26,11 +26,11 @@ md5sum = 2ef471242ab1fe9d0998f49304bfa066
[template-pull-backup]
[template-pull-backup]
filename = instance-pull-backup.cfg.in
filename = instance-pull-backup.cfg.in
md5sum =
44a3166048a81d0d76d69527b1934ef7
md5sum =
1b8645835f04081861266436505fd28f
[template-replicated]
[template-replicated]
filename = template-replicated.cfg.in
filename = template-replicated.cfg.in
md5sum =
2eea3b0227c3ae9e44cfc41df9930fa7
md5sum =
ba90373d7ba062a6b8117b821a2d7765
[template-parts]
[template-parts]
filename = template-parts.cfg.in
filename = template-parts.cfg.in
...
...
stack/resilient/instance-pull-backup.cfg.in
View file @
ad0562fc
...
@@ -124,7 +124,6 @@ pull-push-maximum-run = 5
...
@@ -124,7 +124,6 @@ pull-push-maximum-run = 5
# XXX: this should be named "notifier-host"
# XXX: this should be named "notifier-host"
notifier-url = http://[$${notifier:host}]:$${notifier:port}
notifier-url = http://[$${notifier:host}]:$${notifier:port}
slave-instance-list = {{ dumps(slave_instance_list) }}
slave-instance-list = {{ dumps(slave_instance_list) }}
ignore-known-hosts-file = {{ slapparameter_dict.get('ignore-known-hosts-file', 'false') }}
# To get a verbose feed about PBS state
# To get a verbose feed about PBS state
instance-root-name = $${monitor-instance-parameter:root-instance-title}
instance-root-name = $${monitor-instance-parameter:root-instance-title}
log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/
log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/
...
...
stack/resilient/template-replicated.cfg.in
View file @
ad0562fc
...
@@ -196,7 +196,6 @@ software-type = pull-backup
...
@@ -196,7 +196,6 @@ software-type = pull-backup
[request-pbs-{{namebase}}-{{id}}]
[request-pbs-{{namebase}}-{{id}}]
<= request-pbs-common
<= request-pbs-common
name = PBS ({{namebase}} / {{id}})
name = PBS ({{namebase}} / {{id}})
config-ignore-known-hosts-file = ${slap-parameter:ignore-known-hosts-file}
config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
{% for key, value in six.iteritems(monitor_dict) -%}
{% for key, value in six.iteritems(monitor_dict) -%}
config-{{ key }} = {{ value }}
config-{{ key }} = {{ value }}
...
@@ -294,6 +293,5 @@ sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
...
@@ -294,6 +293,5 @@ sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
{{namebase}}{{id}}-computer-guid =
{{namebase}}{{id}}-computer-guid =
pbs-{{namebase}}{{id}}-computer-guid =
pbs-{{namebase}}{{id}}-computer-guid =
{% endfor %}
{% endfor %}
ignore-known-hosts-file = false
{% endmacro %}
{% endmacro %}
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