[ARVADOS] updated: 2.1.0-2105-g0e089fd82
Git user
git at public.arvados.org
Wed Mar 30 13:00:55 UTC 2022
Summary of changes:
.../multi_host/aws/states/shell_cron_add_login_sync.sls | 7 +++++++
.../single_hostname/states/shell_cron_add_login_sync.sls | 7 +++++++
2 files changed, 14 insertions(+)
via 0e089fd82ba8067b303e87114296c64ee326e9b4 (commit)
from 972f9d0c4c32082e873bcbe29d5f7ac87b66af4a (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 0e089fd82ba8067b303e87114296c64ee326e9b4
Author: Javier Bértoli <jbertoli at curii.com>
Date: Wed Mar 30 10:00:34 2022 -0300
18631: Address review comments
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 8e68b4131..b059aa7b2 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
@@ -49,6 +49,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_get_vm_uuid_cmd_run:
- env:
- ARVADOS_API_TOKEN: {{ api_token }}
- ARVADOS_API_HOST: {{ api_host }}
+ - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }}
- name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/vm_uuid_{{ vm }}
- require:
- cmd: arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run
@@ -70,6 +71,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_get_scoped_token_cmd_run:
- env:
- ARVADOS_API_TOKEN: {{ api_token }}
- ARVADOS_API_HOST: {{ api_host }}
+ - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }}
- name: {{ cmd_query_scoped_token_url }}
- require:
- cmd: extra_shell_cron_add_login_sync_add_{{ vm }}_get_vm_uuid_cmd_run
@@ -86,6 +88,11 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_token_cron_env_present:
- name: ARVADOS_API_TOKEN
- value: __slot__:salt:cmd.run("cat /tmp/scoped_token_{{ vm }}")
+extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_host_insecure_cron_env_present:
+ cron.env_present:
+ - name: ARVADOS_API_HOST_INSECURE
+ - value: {{ arvados.cluster.tls.insecure | default(false) }}
+
extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_env_present:
cron.env_present:
- name: ARVADOS_VIRTUAL_MACHINE_UUID
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 8e68b4131..b059aa7b2 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
@@ -49,6 +49,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_get_vm_uuid_cmd_run:
- env:
- ARVADOS_API_TOKEN: {{ api_token }}
- ARVADOS_API_HOST: {{ api_host }}
+ - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }}
- name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/vm_uuid_{{ vm }}
- require:
- cmd: arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run
@@ -70,6 +71,7 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_get_scoped_token_cmd_run:
- env:
- ARVADOS_API_TOKEN: {{ api_token }}
- ARVADOS_API_HOST: {{ api_host }}
+ - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }}
- name: {{ cmd_query_scoped_token_url }}
- require:
- cmd: extra_shell_cron_add_login_sync_add_{{ vm }}_get_vm_uuid_cmd_run
@@ -86,6 +88,11 @@ extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_token_cron_env_present:
- name: ARVADOS_API_TOKEN
- value: __slot__:salt:cmd.run("cat /tmp/scoped_token_{{ vm }}")
+extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_host_insecure_cron_env_present:
+ cron.env_present:
+ - name: ARVADOS_API_HOST_INSECURE
+ - value: {{ arvados.cluster.tls.insecure | default(false) }}
+
extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_env_present:
cron.env_present:
- name: ARVADOS_VIRTUAL_MACHINE_UUID
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list