Add copyright headers to comply with Arvados
[arvados-formula.git] / arvados / controller / resources / virtual_machines.sls
index 7303dac1c1874eec279548fdfbb968bd03ee98c8..c89b543933f032044a83880993dc12a37247eee3 100644 (file)
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
@@ -42,7 +46,7 @@ arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run:
           --virtual-machine '{"hostname":"{{ vm_name }}" }'
     - unless: |
           {{ cmd_query_vm_uuid }} | \
-          /bin/grep -qE "fixme-2x53u-[a-z0-9]{15}"
+          /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}"
     - require:
       - pkg: arvados-controller-package-install-pkg-installed
       - cmd: arvados-controller-service-running-service-ready-cmd-run
@@ -58,7 +62,7 @@ arvados-controller-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run:
     - require:
       - cmd: arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run
     - unless:
-      - /bin/grep -qE "fixme-2x53u-[a-z0-9]{15}" /tmp/{{ vm }}
+      - /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