18631: move virtual_machines declaration to shell node

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/arvados/controller/init.sls b/arvados/controller/init.sls
index 24f84d068757cf22ef637650171f00bfd303519f..02a98b8f5fdff4dc49e88e16b289461f6cc3b127 100644 (file)
--- a/arvados/controller/init.sls
+++ b/arvados/controller/init.sls
@@ -5,4 +5,3 @@ include:
   - .package
   - ..config
   - .service
   - .package
   - ..config
   - .service

-  - .resources

diff --git a/arvados/shell/init.sls b/arvados/shell/init.sls
index 858a8e6ee0723c478f5fab6ca24f8cc252a7bfc8..26e3e8668f6cdb22c440a394c7a1cf1406cb6e58 100644 (file)
--- a/arvados/shell/init.sls
+++ b/arvados/shell/init.sls
@@ -5,3 +5,4 @@ include:
   - .package
   - .config
   - .service
   - .package
   - .config
   - .service

+  - .resources

diff --git a/arvados/controller/resources/init.sls b/arvados/shell/resources/init.sls
similarity index 100%
rename from arvados/controller/resources/init.sls
rename to arvados/shell/resources/init.sls

diff --git a/arvados/controller/resources/virtual_machines.sls b/arvados/shell/resources/virtual_machines.sls
similarity index 79%
rename from arvados/controller/resources/virtual_machines.sls
rename to arvados/shell/resources/virtual_machines.sls
index 23b8496d24eb12c609f2f161054a1057bac48aa0..18e4c16d701f65107ba7dc998ea5964410debc0e 100644 (file)
--- a/arvados/controller/resources/virtual_machines.sls
+++ b/arvados/shell/resources/virtual_machines.sls
@@ -7,7 +7,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}

-{%- set sls_config_file = tplroot ~ '.config.file' %}
+{#- set sls_config_file = tplroot ~ '.config.file' #}

 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 


@@ -20,10 +20,10 @@
                       else 'arv' %}
 include:
   - ..package
                       else 'arv' %}
 include:
   - ..package

-  - {{ sls_config_file }}
-  - ..service
+  {# - {{ sls_config_file }} #}
+  # - ..service

 
 

-arvados-controller-resources-virtual-machines-jq-pkg-installed:
+arvados-shell-resources-virtual-machines-jq-pkg-installed:

   pkg.installed:
     - name: jq
 
   pkg.installed:
     - name: jq
 


@@ -39,7 +39,7 @@ arvados-controller-resources-virtual-machines-jq-pkg-installed:
   %}
 
 # Create the virtual machine record
   %}
 
 # Create the virtual machine record

-arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run:
+arvados-shell-resources-virtual-machines-{{ vm }}-record-cmd-run:

   cmd.run:
     - env:
       - ARVADOS_API_TOKEN: {{ api_token }}
   cmd.run:
     - env:
       - ARVADOS_API_TOKEN: {{ api_token }}


@@ -54,24 +54,23 @@ arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run:
           {{ cmd_query_vm_uuid }} | \
           /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}"
     - require:
           {{ cmd_query_vm_uuid }} | \
           /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
-      - gem: arvados-controller-package-install-gem-arvados-cli-installed
+      - pkg: arvados-shell-package-install-pkg-installed
+      - gem: arvados-shell-package-install-gem-arvados-cli-installed

 
 # 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 :|
 
 # 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 :|

-arvados-controller-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run:
+arvados-shell-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run:

   cmd.run:
     {%- if arvados.ruby.manage_ruby and arvados.ruby.use_rvm %}
     - prepend_path: /usr/local/rvm/gems/{{ arvados.ruby.pkg }}/bin
     {%- endif %}
     - name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/{{ vm }}
     - require:
   cmd.run:
     {%- if arvados.ruby.manage_ruby and arvados.ruby.use_rvm %}
     - prepend_path: /usr/local/rvm/gems/{{ arvados.ruby.pkg }}/bin
     {%- endif %}
     - name: {{ cmd_query_vm_uuid }} | head -1 | tee /tmp/{{ vm }}
     - require:

-      - cmd: arvados-controller-resources-virtual-machines-{{ vm }}-record-cmd-run
-      - gem: arvados-controller-package-install-gem-arvados-cli-installed
+      - cmd: arvados-shell-resources-virtual-machines-{{ vm }}-record-cmd-run
+      - gem: arvados-shell-package-install-gem-arvados-cli-installed

     - unless:
       - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/{{ vm }}
 
     - unless:
       - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/{{ vm }}
 


@@ -88,7 +87,7 @@ arvados-controller-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run:
   %}
 
 # Create the VM scoped tokens
   %}
 
 # Create the VM scoped tokens

-arvados-controller-resources-virtual-machines-{{ vm }}-scoped-token-cmd-run:
+arvados-shell-resources-virtual-machines-{{ vm }}-scoped-token-cmd-run:

   cmd.run:
     - env:
       - ARVADOS_API_TOKEN: {{ api_token }}
   cmd.run:
     - env:
       - ARVADOS_API_TOKEN: {{ api_token }}


@@ -102,9 +101,9 @@ arvados-controller-resources-virtual-machines-{{ vm }}-scoped-token-cmd-run:
           --api-client-authorization '{"scopes":["GET /arvados/v1/virtual_machines/'${VM_UUID}'/logins"]}'
     - unless: {{ cmd_query_scoped_token_url }}
     - require:
           --api-client-authorization '{"scopes":["GET /arvados/v1/virtual_machines/'${VM_UUID}'/logins"]}'
     - unless: {{ cmd_query_scoped_token_url }}
     - require:

-      - pkg: arvados-controller-package-install-pkg-installed
-      - pkg: arvados-controller-resources-virtual-machines-jq-pkg-installed
-      - cmd: arvados-controller-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run
-      - gem: arvados-controller-package-install-gem-arvados-cli-installed
+      - pkg: arvados-shell-package-install-pkg-installed
+      - pkg: arvados-shell-resources-virtual-machines-jq-pkg-installed
+      - cmd: arvados-shell-resources-virtual-machines-{{ vm }}-get-vm_uuid-cmd-run
+      - gem: arvados-shell-package-install-gem-arvados-cli-installed

 
 {%- endfor %}
 
 {%- endfor %}

diff --git a/kitchen.yml b/kitchen.yml
index e7f200bb2b5f85281f233682bc1728a3dd420c66..81f6e82249219adbc88c61caf65ee908ee0cebef 100644 (file)
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -57,53 +57,53 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:centos-7
 
     driver:
       image: saltimages/salt-master-py3:centos-7
 

-  ## SALT `3004.0`
-  - name: debian-11-3004.0-py3
+  ## SALT `3004.1`
+  - name: debian-11-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3004.0-py3:debian-11
-  - name: debian-10-3004.0-py3
+      image: saltimages/salt-3004.1-py3:debian-11
+  - name: debian-10-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3004.0-py3:debian-10
-  - name: ubuntu-2004-3004.0-py3
+      image: saltimages/salt-3004.1-py3:debian-10
+  - name: ubuntu-2004-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3004.0-py3:ubuntu-20.04
-  - name: ubuntu-1804-3004.0-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3004.0-py3:ubuntu-18.04
-  - name: centos-7-3004.0-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
+  - name: centos-7-3004.1-py3

     driver:
     driver:

-      image: saltimages/salt-3004.0-py3:centos-7
+      image: saltimages/salt-3004.1-py3:centos-7

 
 

-  ## SALT `3003.3`
-  - name: debian-11-3003.3-py3
+  ## SALT `3003.4`
+  - name: debian-11-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3003.3-py3:debian-11
-  - name: debian-10-3003.3-py3
+      image: saltimages/salt-3003.4-py3:debian-11
+  - name: debian-10-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3003.3-py3:debian-10
-  - name: ubuntu-2004-3003.3-py3
+      image: saltimages/salt-3003.4-py3:debian-10
+  - name: ubuntu-2004-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3003.3-py3:ubuntu-20.04
-  - name: ubuntu-1804-3003.3-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3003.3-py3:ubuntu-18.04
-  - name: centos-7-3003.3-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+  - name: centos-7-3003.4-py3

     driver:
     driver:

-      image: saltimages/salt-3003.3-py3:centos-7
+      image: saltimages/salt-3003.4-py3:centos-7

 
 

-  ## SALT `3002.7`
-  - name: debian-10-3002.7-py3
+  ## SALT `3002.8`
+  - name: debian-10-3002.8-py3

     driver:
     driver:

-      image: saltimages/salt-3002.7-py3:debian-10
-  - name: ubuntu-2004-3002.7-py3
+      image: saltimages/salt-3002.8-py3:debian-10
+  - name: ubuntu-2004-3002.8-py3

     driver:
     driver:

-      image: saltimages/salt-3002.7-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002.7-py3
+      image: saltimages/salt-3002.8-py3:ubuntu-20.04
+  - name: ubuntu-1804-3002.8-py3

     driver:
     driver:

-      image: saltimages/salt-3002.7-py3:ubuntu-18.04
-  - name: centos-7-3002.7-py3
+      image: saltimages/salt-3002.8-py3:ubuntu-18.04
+  - name: centos-7-3002.8-py3

     driver:
     driver:

-      image: saltimages/salt-3002.7-py3:centos-7
+      image: saltimages/salt-3002.8-py3:centos-7

 
 verifier:
   # https://www.inspec.io/
 
 verifier:
   # https://www.inspec.io/