[ARVADOS] updated: 2.1.0-2242-ga9a4f7d43

[Git user]

Summary of changes:
 tools/salt-install/Vagrantfile                     | 14 ++--
 .../multi_host/aws/pillars/arvados.sls             |  7 ++
 .../aws/states/shell_cron_add_login_sync.sls       | 86 ++++++++++++++++++++++
 .../multiple_hostnames/pillars/arvados.sls         |  3 +-
 .../single_hostname/pillars/arvados.sls            |  4 +-
 .../states/shell_cron_add_login_sync.sls           | 86 ++++++++++++++++++++++
 tools/salt-install/provision.sh                    |  6 +-
 7 files changed, 193 insertions(+), 13 deletions(-)
 create mode 100644 tools/salt-install/config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls
 create mode 100644 tools/salt-install/config_examples/single_host/single_hostname/states/shell_cron_add_login_sync.sls

       via  a9a4f7d43340f4f317fb041c93b9aa9c1b6e51c8 (commit)
       via  90eb8645563167006569f0ffa6951d484d12374b (commit)
       via  e4aefa613bd4cc313f705560ae4fad25cd806a4b (commit)
       via  ad9dfa8583197097caf3d2fb41771e9f09e55252 (commit)
       via  288c5ac7a2bd3f88cccd56b7fb642449f6134777 (commit)
       via  07440bacc85564c7e2e03008336d395480333ff7 (commit)
       via  1105e279fd18b4dabff36f125978213d8c7a08ac (commit)
       via  809668479c6ab182d879ed2aa0cfcae051a5eda7 (commit)
       via  8d8d5ca18cfb22420954fdb13e8e2a0db29b290b (commit)
       via  0e089fd82ba8067b303e87114296c64ee326e9b4 (commit)
       via  972f9d0c4c32082e873bcbe29d5f7ac87b66af4a (commit)
      from  13b9ac29613cc3dd84f285c830c09da8c96b4588 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a9a4f7d43340f4f317fb041c93b9aa9c1b6e51c8
Merge: 13b9ac296 90eb86455
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Wed Apr 6 10:50:51 2022 -0300

    Merge branch '18631-shell-login-sync'
    
    closes #18631
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>


commit 90eb8645563167006569f0ffa6951d484d12374b
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Wed Apr 6 10:30:07 2022 -0300

    18631: fix path in shell login-sync cron
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at 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 c3a113064..86c591e97 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
@@ -77,7 +77,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_e
 
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_login_sync_cron_present:
   cron.present:
-    - name: arvados-login-sync
+    - name: /usr/local/bin/arvados-login-sync
     - minute: '*/2'
     - onlyif:
       - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
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 4b98d7b23..86c591e97 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
@@ -44,6 +44,8 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_get_vm_uuid_cmd_run:
     - name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/vm_uuid_{{ vm }}
     - unless:
       - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
+    - require:
+      - gem: arvados-shell-package-install-gem-arvados-cli-installed
 
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_host_cron_env_present:
   cron.env_present:
@@ -75,7 +77,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_e
 
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_login_sync_cron_present:
   cron.present:
-    - name: arvados-login-sync
+    - name: /usr/local/bin/arvados-login-sync
     - minute: '*/2'
     - onlyif:
       - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}

-----------------------------------------------------------------------


hooks/post-receive
--