From ad9dfa8583197097caf3d2fb41771e9f09e55252 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Fri, 1 Apr 2022 13:46:33 -0300 Subject: [PATCH 1/1] 18631: remove unneeded dependency installing api into shell nodes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../multi_host/aws/states/shell_cron_add_login_sync.sls | 5 ----- .../single_hostname/states/shell_cron_add_login_sync.sls | 5 ----- 2 files changed, 10 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls b/tools/salt-install/config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls index 73b38877a2..4b98d7b237 100644 --- a/tools/salt-install/config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls +++ b/tools/salt-install/config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls @@ -9,8 +9,6 @@ {%- set curr_tpldir = tpldir %} {%- set tpldir = 'arvados' %} -{%- set sls_config_file = 'arvados.config.file' %} -{# from "arvados/map.jinja" import arvados with context #} {%- from "arvados/map.jinja" import arvados with context %} {%- from "arvados/libtofs.jinja" import files_switch with context %} {%- set tpldir = curr_tpldir %} @@ -19,9 +17,6 @@ {%- set api_token = arvados.cluster.tokens.system_root | yaml_encode %} {%- set api_host = arvados.cluster.Services.Controller.ExternalURL | regex_replace('^http(s?)://', '', ignorecase=true) %} -include: - - arvados - extra_shell_cron_add_login_sync_add_jq_pkg_installed: pkg.installed: - name: jq diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/shell_cron_add_login_sync.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/shell_cron_add_login_sync.sls index 73b38877a2..4b98d7b237 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/states/shell_cron_add_login_sync.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/states/shell_cron_add_login_sync.sls @@ -9,8 +9,6 @@ {%- set curr_tpldir = tpldir %} {%- set tpldir = 'arvados' %} -{%- set sls_config_file = 'arvados.config.file' %} -{# from "arvados/map.jinja" import arvados with context #} {%- from "arvados/map.jinja" import arvados with context %} {%- from "arvados/libtofs.jinja" import files_switch with context %} {%- set tpldir = curr_tpldir %} @@ -19,9 +17,6 @@ {%- set api_token = arvados.cluster.tokens.system_root | yaml_encode %} {%- set api_host = arvados.cluster.Services.Controller.ExternalURL | regex_replace('^http(s?)://', '', ignorecase=true) %} -include: - - arvados - extra_shell_cron_add_login_sync_add_jq_pkg_installed: pkg.installed: - name: jq -- 2.30.2