Remove all occurrences of the obsolete 'parameters-extra' option

This is a follow-up of commit 5c980caf,
now that the new code of the 'wrapper' recipe is used (1.0.58 released).

software/apache-frontend/instance-apache-frontend.cfg

@@ -479,7 +479,6 @@ recipe = slapos.cookbook:wrapper
 command-line = ${trafficserver:location}/bin/traffic_line
 wrapper-path = $${directory:bin}/traffic_line
 environment = TS_ROOT=$${buildout:directory}
-parameters-extra = true
 
 [trafficserver-promise-cache-availability]
 recipe = collective.recipe.template
@@ -576,13 +575,11 @@ port = $${apache-configuration:ssl-cache-through-port}
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${apache-configuration:pid-file} 
 wrapper-path = $${directory:promise}/apache-frontend-is-running-actual-software-release
-parameters-extra = true
 
 [promise-apache-mpm-watchdog]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/apache-mpm-watchdog --url http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u admin -p $${monitor-htpasswd:passwd} -d $${directory:run}/apache-mpm-watchdog.json 
 wrapper-path = $${directory:promise}/apache-mpm-watchdog
-parameters-extra = true
 
 
 [slap_connection]
@@ -744,4 +741,3 @@ port = $${instance-parameter:configuration.plain_nginx_port}
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${nginx-configuration:pid-file} 
 wrapper-path = $${directory:promise}/promise-nginx-is-process-older-than-dependency-set
-parameters-extra = true

software/cloudooo/instance-cloudooo.cfg.in

@@ -285,4 +285,3 @@ environment =
   DISPLAY=:0
   TMPDIR=${directory:run}
 command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver
-parameters-extra = true

software/dream/instance.cfg

@@ -28,14 +28,12 @@ host = $${instance-parameter:ipv6-random}
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/dream_interpreter
 wrapper-path = $${buildout:bin-directory}/dream_interpreter
-parameters-extra = true
 
 # service
 [dream_platform]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/dream_platform --debug --host $${dream_platform_parameter:host} --port $${dream_platform_parameter:port} --log $${directory:log}/dream_platform.log
 wrapper-path = $${directory:service}/dream_platform
-parameters-extra = true
 
 [grunt_watch]
 recipe = slapos.cookbook:wrapper
@@ -47,13 +45,11 @@ wrapper-path = $${directory:service}/dream_grunt_watch
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/dream_simulation
 wrapper-path = $${directory:script}/dream_simulation
-parameters-extra = true
 
 [dream_test_suite]
 recipe = slapos.cookbook:wrapper
 command-line = ${dream_testrunner:script}
 wrapper-path = $${directory:script}/dream_test_suite
-parameters-extra = true
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

software/gitlab/instance-gitlab.cfg.in

@@ -277,7 +277,6 @@ context-extra =
 [gitlab-bin]
 recipe  = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/${:_buildout_section_name_}
-parameters-extra = true
 # NOTE $HOME needed to pick gitconfig
 environment  =
     BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile
@@ -285,8 +284,6 @@ environment  =
     RAILS_ENV = production
     SIDEKIQ_MEMORY_KILLER_MAX_RSS = ${instance-parameter:configuration.sidekiq_memory_killer_max_rss}
 
-# NOTE sys.argv[1:] implicitly appended
-# (by slapos.recipe.librecipe.execute.generic_exec() at runtime)
 command-line =
     {{ bundler_4gitlab }} exec sh -c
     'cd ${gitlab-work:location} && ${:prog} "$@"' ${:prog}

software/jupyter/instance.cfg.in

@@ -69,7 +69,6 @@ command-line =
   --notebook-dir=${instance-parameter:notebook_dir}
   --log-level="DEBUG"
 wrapper-path = ${directory:service}/jupyter-lab
-parameters-extra = true
 environment =
   JUPYTER_PATH=${directory:jupyter_dir}
   JUPYTER_CONFIG_DIR=${directory:jupyter_config_dir}

software/monitor/instance-monitor-distributor.cfg.jinja2

@@ -67,7 +67,6 @@ recipe = slapos.cookbook:wrapper
 command-line = 
   {{ wget_bin }} --no-check-certificate -l1 -r -nd --timestamp  
 wrapper-path = ${monitor-directory:bin}/log-crawler
-parameters-extra = true
 
 [buildout]
 extends = {{ instance_base_monitor }}

software/monitor/instance-monitor.cfg.jinja2

@@ -99,7 +99,6 @@ recipe = slapos.cookbook:wrapper
 command-line = 
   ${monitor-directory:bin}/python {{ monitor_collect_csv_dump }} --output_folder ${monitor-directory:fluentd-log}/consumption/
 wrapper-path = ${monitor-directory:reports}/monitor-collect-csv-dump  
-parameters-extra = true
 
 [monitor-check-cpu-usage]
 recipe = slapos.cookbook:wrapper

software/neoppod/instance-neo-admin.cfg.in

@@ -36,5 +36,4 @@ command-line =
     --cert ${directory:etc}/neo.crt
     --key ${directory:etc}/neo.key
 {%- endif %}
-parameters-extra = True
 wrapper-path = ${directory:bin}/neoctl

software/neotest/instance.cfg.in

@@ -26,4 +26,3 @@ recipe  = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/${:_buildout_section_name_}
 command-line = /bin/bash -c 'cd ${directory:neotest} && ${software:bin}/neotest-runTestSuite "$@"' runTestSuite
 # vvv appends "$@" to argv ^^^ without shell-escaping
-parameters-extra = true

software/slapos-in-partition/instance.cfg.jinja2

@@ -122,31 +122,26 @@ certificate-repository-path = ${directory:slapos-partitions-certificate-reposito
 recipe = slapos.cookbook:wrapper
 command-line = {{ bin_directory }}/slapos node instance --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-instance.pid --logfile ${directory:slapos-log}/slapos-instance.log
 wrapper-path = ${directory:bin}/slapos-node-instance
-parameters-extra = true
 
 [slapos-node-software-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = {{ bin_directory }}/slapos node software --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-software.pid --logfile ${directory:slapos-log}/slapos-software.log
 wrapper-path = ${directory:bin}/slapos-node-software
-parameters-extra = true
 
 [slapos-node-report-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = {{ bin_directory }}/slapos node report --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-report.pid --logfile ${directory:slapos-log}/slapos-report.log
 wrapper-path = ${directory:bin}/slapos-node-report
-parameters-extra = true
 
 [slapos-node-status-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = {{ bin_directory }}/slapos node status --cfg ${slapos-configuration-file:output}
 wrapper-path = ${directory:bin}/slapos-node-status
-parameters-extra = true
 
 [slapos-node-format-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = {{ bin_directory }}/slapos node format --cfg ${slapos-configuration-file:output} --logfile=${directory:slapos-log}/slapos-node-format.log --now
 wrapper-path = ${directory:bin}/slapos-node-format
-parameters-extra = true
 
 [slapos-node-format-wrapper-script]
 # Create a wrapper of the wrapper in etc/run

software/slapos-master/instance-balancer.cfg.in

@@ -41,7 +41,6 @@ mode = {{ mode }}
 [certificate-request-base]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/request-instance-certificate
-parameters-extra = true
 command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb
   --crt-file ${apache-conf-ssl:cert}
   --key-file ${apache-conf-ssl:key}

software/slapos-testing/instance.cfg

@@ -116,4 +116,3 @@ mode = 755
 recipe = slapos.cookbook:wrapper
 command-line = ${phantomjs:location}/phantomjs-slapos
 wrapper-path = $${create-directory:bin}/phantomjs
-parameters-extra = true

software/slaprunner/instance-runner.cfg

@@ -208,7 +208,6 @@ command-line = ${buildout:directory}/bin/slaprunnertest $${:arguments}
 wrapper-path = $${directory:bin}/runTestSuite
 environment = PATH=$${shell-environment:path}
   RUNNER_CONFIG=$${slapos-cfg:rendered} 
-parameters-extra = true
 
 # Deploy openssh-server
 [runner-sshd-port]

stack/caucase/instance-auth-server.cfg.jinja2.in

@@ -33,7 +33,6 @@ wrapper-path = ${directory:bin}/request-instance-certificate
 cert-file = ${directory:ssl}/instance.cert.pem
 key-file = ${directory:ssl}/instance.key.pem
 ca-cert = ${directory:ssl}/cacert.pem
-parameters-extra = true
 command-line = {{ certificate_request_bin }}
   --crt-file ${:cert-file}
   --key-file ${:key-file}

stack/caucase/instance-caucase.cfg.jinja2.in

@@ -57,7 +57,6 @@ wrapper-path = ${directory:bin}/request-base-certificate
 cert-file = ${ca-nginx-ssl-config:cert}
 key-file = ${ca-nginx-ssl-config:key}
 ca-cert = ${directory:ssl}/cacert.pem
-parameters-extra = true
 command-line = {{ certificate_request_bin }}
   --crt-file ${:cert-file}
   --key-file ${:key-file}

stack/erp5/instance-balancer.cfg.in

@@ -40,7 +40,6 @@ mode = {{ mode }}
 [certificate-request-base]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/request-instance-certificate
-parameters-extra = true
 command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb
   --crt-file ${apache-conf-ssl:cert}
   --key-file ${apache-conf-ssl:key}

stack/erp5/instance-cloudoo.cfg.in

@@ -149,4 +149,3 @@ environment =
   DISPLAY=:0
   TMPDIR=${directory:run}
 command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver
-parameters-extra = true

stack/erp5/instance-mariadb.cfg.in

@@ -223,7 +223,6 @@ recipe = slapos.cookbook:wrapper
 # will reject it.
 command-line = "{{ parameter_dict['mariadb-location'] }}/bin/${:command}" --defaults-file="${my-cnf:rendered}"
 wrapper-path = ${directory:bin}/${:command}
-parameters-extra = true
 
 [binary-wrap-mysql]
 < = binary-wrap-base
@@ -329,7 +328,6 @@ command-line = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }}
 recipe = slapos.cookbook:wrapper
 command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}"
 wrapper-path = ${directory:promise}/mariadb
-parameters-extra = true
 
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}

stack/erp5/instance-postfix.cfg.in

@@ -61,7 +61,6 @@ var-spool-postfix-trace = ${:var-spool-postfix}/trace
 {%   set socket = 'inet:' ~ ip ~ ':' ~ milter_port -%}
 [{{ section('divert-milter') }}]
 recipe = slapos.cookbook:wrapper
-parameters-extra = true
 command-line =
   '{{ parameter_dict['buildout-bin-directory'] }}/munnel'
   --listen '{{ socket }}'
@@ -183,7 +182,6 @@ update-command = ${:command}
 
 [wrapper-postfix-saslpasswd2]
 recipe = slapos.cookbook:wrapper
-parameters-extra = true
 command-line = '{{ parameter_dict['cyrus-sasl-location'] }}/sbin/saslpasswd2' -f '${configuration:cyrus-sasldb}'
 wrapper-path = ${directory:bin}/saslpasswd2
 
@@ -192,7 +190,6 @@ recipe = slapos.cookbook:wrapper
 environment =
   MAIL_CONFIG=${directory:etc-postfix}
   SASL_CONF_PATH=${directory:etc-cyrus}
-parameters-extra = true
 
 [base-bin-wrapper]
 < = base-wrapper

stack/erp5/instance-zope.cfg.in

@@ -183,7 +183,6 @@ recipe = slapos.cookbook:wrapper
 environment =
   HOSTALIASES=${hostaliases:rendered}
   HOSTS=${hosts:rendered}
-parameters-extra = true
 command-line = '{{ parameter_dict['userhosts'] }}' ${:wrapped-command-line}
 
 {# Hack to deploy SSL certs via instance parameters -#}
@@ -370,7 +369,6 @@ path = ${directory:promises}/{{ name }}
 recipe = slapos.cookbook:wrapper
 command-line = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }}
 wrapper-path = ${directory:promises}/{{ name }}-is-running-actual-product
-parameters-extra = true
 
 {% if use_ipv6 -%}
 [{{ zope_tunnel_section_name }}]

stack/logrotate/instance-logrotate-base.cfg.in

@@ -55,7 +55,6 @@ nocompress =
 
 [logrotate]
 recipe = slapos.cookbook:wrapper
-parameters-extra = true
 command-line = {{ logrotate_location }}/sbin/logrotate -s "${logrotate-directory:srv}/logrotate.status" "${logrotate-conf:rendered}"
 wrapper-path = ${logrotate-directory:bin}/logrotate
 

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -250,7 +250,6 @@ mode = 700
 recipe = slapos.cookbook:wrapper
 command-line = {{ bin_directory }}/is-process-older-than-dependency-set ${monitor-httpd-conf-parameter:pid-file} 
 wrapper-path = ${directory:promises}/promise-monitor-httpd-is-process-older-than-dependency-set
-parameters-extra = true
 
 [monitor-globalstate-wrapper]
 recipe = slapos.cookbook:wrapper

stack/resilient/instance-pull-backup.cfg.in

@@ -254,7 +254,6 @@ home = $${basedirectory:ssh-home}
 identity-file = $${:home}/id_rsa
 command-line = ${openssh:location}/bin/ssh -T -o "UserKnownHostsFile $${pbs:known-hosts}" -i $${:identity-file}
 wrapper-path = $${rootdirectory:bin}/ssh
-parameters-extra = true
 
 
 #----------------