projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0e089fd)
18631: Address review comments, fix VM UUID in cron
authorJavier Bértoli <jbertoli@curii.com>
Wed, 30 Mar 2022 15:33:49 +0000 (12:33 -0300)
committerJavier Bértoli <jbertoli@curii.com>
Wed, 30 Mar 2022 15:33:49 +0000 (12:33 -0300)
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

tools/salt-install/config_examples/multi_host/aws/states/shell_cron_add_login_sync.sls patch | blob | history
tools/salt-install/config_examples/single_host/single_hostname/states/shell_cron_add_login_sync.sls patch | blob | history

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 b059aa7b2d91b623b58ac64e8bb8594e6eea7ee0..70fbe5a62a9a4757ffcae91261261002a4a53bfc 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
@@ -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 b059aa7b2d91b623b58ac64e8bb8594e6eea7ee0..70fbe5a62a9a4757ffcae91261261002a4a53bfc 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
@@ -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: