[ARVADOS] updated: 2.1.0-2106-g8d8d5ca18

[Git user]

Summary of changes:
 .../config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls | 2 +-
 .../single_host/single_hostname/states/shell_cron_add_login_sync.sls    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  8d8d5ca18cfb22420954fdb13e8e2a0db29b290b (commit)
      from  0e089fd82ba8067b303e87114296c64ee326e9b4 (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 8d8d5ca18cfb22420954fdb13e8e2a0db29b290b
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Wed Mar 30 12:33:49 2022 -0300

    18631: Address review comments, fix VM UUID in 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 b059aa7b2..70fbe5a62 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
@@ -96,7 +96,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_host_insecure_cron_env_
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_env_present:
   cron.env_present:
     - name: ARVADOS_VIRTUAL_MACHINE_UUID
-    - value: __slot__:salt:cmd.run("cat /tmp/scoped_token_{{ vm }}")
+    - value: __slot__:salt:cmd.run("cat /tmp/vm_uuid_{{ vm }}")
 
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_login_sync_cron_present:
   cron.present:
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 b059aa7b2..70fbe5a62 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
@@ -96,7 +96,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_host_insecure_cron_env_
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_env_present:
   cron.env_present:
     - name: ARVADOS_VIRTUAL_MACHINE_UUID
-    - value: __slot__:salt:cmd.run("cat /tmp/scoped_token_{{ vm }}")
+    - value: __slot__:salt:cmd.run("cat /tmp/vm_uuid_{{ vm }}")
 
 extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_login_sync_cron_present:
   cron.present:

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


hooks/post-receive
--