18631: remove unneeded dependency installing api into shell nodes

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

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 73b38877a292ecdd2f87b01ee1f1dc09d530f4bc..4b98d7b237d2e139add2787dff61fefd1a0e49e6 100644 (file)
--- 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 73b38877a292ecdd2f87b01ee1f1dc09d530f4bc..4b98d7b237d2e139add2787dff61fefd1a0e49e6 100644 (file)
--- 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