projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18631: Address review comments
[arvados.git]
/
tools
/
salt-install
/
config_examples
/
multi_host
/
aws
/
states
/
shell_cron_add_login_sync.sls
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 8e68b4131a6a11f1814f7460122c52335eb42753..b059aa7b2d91b623b58ac64e8bb8594e6eea7ee0 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
@@
-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 }}
- 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
- 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 }}
- 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
- 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 }}")
- 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
extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_virtual_machine_uuid_cron_env_present:
cron.env_present:
- name: ARVADOS_VIRTUAL_MACHINE_UUID