{%- set curr_tpldir = tpldir %}
{%- set tpldir = 'arvados' %}
-{%- set sls_config_file = 'arvados.config.file' %}
-{# from "arvados/map.jinja" import arvados with context #}
{%- from "arvados/map.jinja" import arvados with context %}
{%- from "arvados/libtofs.jinja" import files_switch with context %}
{%- set tpldir = curr_tpldir %}
{%- set api_token = arvados.cluster.tokens.system_root | yaml_encode %}
{%- set api_host = arvados.cluster.Services.Controller.ExternalURL | regex_replace('^http(s?)://', '', ignorecase=true) %}
-include:
- - arvados
-
extra_shell_cron_add_login_sync_add_jq_pkg_installed:
pkg.installed:
- name: jq
- 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
- unless:
- /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
+ - require:
+ - gem: arvados-shell-package-install-gem-arvados-cli-installed
extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_host_cron_env_present:
cron.env_present:
- name: ARVADOS_API_HOST
- value: {{ api_host }}
+ - onlyif:
+ - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_token_cron_env_present:
cron.env_present:
- name: ARVADOS_API_TOKEN
- value: {{ api_token }}
+ - onlyif:
+ - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ 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) }}
+ - onlyif:
+ - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
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/vm_uuid_{{ vm }}")
+ - onlyif:
+ - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
+
+extra_shell_cron_add_login_sync_add_{{ vm }}_sbin_to_path_cron_env_present:
+ cron.env_present:
+ - name: PATH
+ - value: "/bin:/usr/bin:/usr/sbin"
+ - onlyif:
+ - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
extra_shell_cron_add_login_sync_add_{{ vm }}_arvados_login_sync_cron_present:
cron.present:
- - name: arvados-login-sync
+ - name: /usr/local/bin/arvados-login-sync
- minute: '*/2'
+ - onlyif:
+ - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }}
{%- endif %}
{%- endfor %}