Commit cc163b17 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

Update Release Candidate

parents 52123049 e3829420
...@@ -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}
......
...@@ -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
} }
} }
} }
......
...@@ -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
} }
} }
} }
......
...@@ -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
} }
} }
} }
......
...@@ -79,7 +79,6 @@ parts += ...@@ -79,7 +79,6 @@ parts +=
genbt5list genbt5list
# some additional utils # some additional utils
zodbanalyze
zodbpack zodbpack
# Create instance template # Create instance template
...@@ -594,13 +593,6 @@ eggs = ...@@ -594,13 +593,6 @@ eggs =
munnel munnel
patch-binary = ${eggs:patch-binary} patch-binary = ${eggs:patch-binary}
[zodbanalyze]
recipe = zc.recipe.egg
eggs = erp5.util
entry-points =
zodbanalyze=erp5.util.zodbanalyze:main
scripts = zodbanalyze
# develop erp5.util from parts/erp5/ # develop erp5.util from parts/erp5/
[erp5-util-develop] [erp5-util-develop]
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
......
...@@ -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
......
...@@ -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/
......
...@@ -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 %}
...@@ -194,8 +194,8 @@ setproctitle = 1.1.10 ...@@ -194,8 +194,8 @@ setproctitle = 1.1.10
setuptools-dso = 1.7 setuptools-dso = 1.7
rubygemsrecipe = 0.4.3 rubygemsrecipe = 0.4.3
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.252 slapos.cookbook = 1.0.253
slapos.core = 1.7.9 slapos.core = 1.7.10
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25 slapos.libnetworkcache = 0.25
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment