From: Javier Bértoli Date: Wed, 30 Mar 2022 15:33:49 +0000 (-0300) Subject: 18631: Address review comments, fix VM UUID in cron X-Git-Tag: 2.5.0~225^2~7 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8d8d5ca18cfb22420954fdb13e8e2a0db29b290b 18631: Address review comments, fix VM UUID in cron Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- 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 b059aa7b2d..70fbe5a62a 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 b059aa7b2d..70fbe5a62a 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: