From 224ca1433f6e3dbc3a20fdffdc4e6915a26bb73b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 6 Apr 2022 10:47:42 -0300 Subject: [PATCH] 18631: update shell login-sync cron example MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../arvados/shell/cron/add-login-sync.sls | 93 +++++++++---------- 1 file changed, 43 insertions(+), 50 deletions(-) diff --git a/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls b/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls index fdcf599..a14808b 100644 --- a/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls +++ b/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls @@ -1,22 +1,23 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 # This state tries to query the controller using the parameters set in # the `arvados.cluster.resources.virtual_machines` pillar, to get the -# scoped_token for the host and configure the arvados login-sync cron -# as described in https://doc.arvados.org/v2.0/install/install-shell-server.html +# ARVADOS_VIRTUAL_MACHINE_UUID for the host and configure the arvados login-sync cron +# as described in https://doc.arvados.org/main/install/install-shell-server.html -{#- Get the `tplroot` from `tpldir` #} -{%- set tplroot = tpldir.split('/')[0] %} -{%- set sls_config_file = tplroot ~ '.config.file' %} -{%- from tplroot ~ "/map.jinja" import arvados with context %} -{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} +{%- set curr_tpldir = tpldir %} +{%- set tpldir = 'arvados' %} +{%- from "arvados/map.jinja" import arvados with context %} +{%- from "arvados/libtofs.jinja" import files_switch with context %} +{%- set tpldir = curr_tpldir %} {%- set virtual_machines = arvados.cluster.resources.virtual_machines | default({}) %} {%- set api_token = arvados.cluster.tokens.system_root | yaml_encode %} {%- set api_host = arvados.cluster.Services.Controller.ExternalURL | regex_replace('^http(s?)://', '', ignorecase=true) %} -examples-arvados-shell-cron-add-login-sync-add-jq-pkg-installed: +examples_arvados_shell_cron_add_login_sync_add_jq_pkg_installed: pkg.installed: - name: jq @@ -26,68 +27,60 @@ examples-arvados-shell-cron-add-login-sync-add-jq-pkg-installed: # Check if any of the specified virtual_machines parameters corresponds to this instance # It should be an error if we get more than one occurrence {%- if vm_name in [grains['id'], grains['host'], grains['fqdn'], grains['nodename']] or - backend in [grains['id'], grains['host'], grains['fqdn'], grains['nodename']] + - grains['ipv4'] + grains['ipv6'] %} + vm_params.backend in [grains['id'], grains['host'], grains['fqdn'], grains['nodename']] + + grains['ipv4'] + grains['ipv6'] %} + # We need to query the VM UUID {%- set cmd_query_vm_uuid = 'arv --short virtual_machine list' ~ ' --filters \'[["hostname", "=", "' ~ vm_name ~ '"]]\'' %} -# We need to use the UUID generated in the previous command to see if there's a -# scoped token for it. There's no easy way to pass the value from a shellout -# to another state, so we store it in a temp file and use that in the next -# command. Flaky, mostly because the `unless` clause is just checking thatg -# the file content is a token uuid :| -examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-get-vm_uuid-cmd-run: +examples_arvados_shell_cron_add_login_sync_add_{{ vm }}_get_vm_uuid_cmd_run: cmd.run: - env: - ARVADOS_API_TOKEN: {{ api_token }} - ARVADOS_API_HOST: {{ api_host }} - - name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/{{ vm }} - - require: - - cmd: examples-arvados-shell-cron-add-login-sync-add-resources-virtual-machines-{{ vm }}-record-cmd-run + - ARVADOS_API_HOST_INSECURE: {{ arvados.cluster.tls.insecure | default(false) }} + - name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/vm_uuid_{{ vm }} - unless: - - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/{{ vm }} - - # There's no direct way to query the scoped_token for a given virtual_machine - # so we need to parse the api_client_authorization list through some jq - {%- set cmd_query_scoped_token_url = 'VM_UUID=$(cat /tmp/' ~ vm ~ ') && ' ~ - 'arv api_client_authorization list | ' ~ - '/usr/bin/jq -e \'.items[]| select(.scopes[] == "GET ' ~ - '/arvados/v1/virtual_machines/\'${VM_UUID}\'/logins") | ' ~ - '.api_token\' | head -1 | tee /tmp/sctk' ~ vm ~ ' && ' ~ - 'unset VM_UUID' - %} - -examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-get-scoped_token-cmd-run: - cmd.run: - - env: - - ARVADOS_API_TOKEN: {{ api_token }} - - ARVADOS_API_HOST: {{ api_host }} - - name: {{ cmd_query_scoped_token_url }} + - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }} - require: - - cmd: examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-get-vm_uuid-cmd-run - - unless: - - test -s /tmp/sctk{{ vm }} + - gem: arvados-shell-package-install-gem-arvados-cli-installed -examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-arvados-host-cron-env-present: +examples_arvados_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 }} -examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-arvados-api-cron-token-env-present: +examples_arvados_shell_cron_add_login_sync_add_{{ vm }}_arvados_api_token_cron_env_present: cron.env_present: - name: ARVADOS_API_TOKEN - - value: __slot__:salt:cmd.run(cat /tmp/sctk{{ vm }}) + - value: {{ api_token }} + - onlyif: + - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/vm_uuid_{{ vm }} + +examples_arvados_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 }} -examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-arvados-api-cron-token-env-present: +examples_arvados_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 }}) + - 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 }} -examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-arvados-login-sync-cron-present: +examples_arvados_shell_cron_add_login_sync_add_{{ vm }}_arvados_login_sync_cron_present: cron.present: - minute: '*/2' - cmd: 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 %} -- 2.30.2