From 8d8d5ca18cfb22420954fdb13e8e2a0db29b290b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 30 Mar 2022 12:33:49 -0300 Subject: [PATCH] 18631: Address review comments, fix VM UUID in cron MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../multi_host/aws/states/shell_cron_add_login_sync.sls | 2 +- .../single_hostname/states/shell_cron_add_login_sync.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: -- 2.30.2