Merge compute playbook into gpu playbook

ansible/gpu.yml

@@ -5,3 +5,8 @@
   roles:
     - { name: 'install_packages', tags: 'install_packages' }
     - { name: 'cuda_driver', tags: 'cuda_driver' }
+    - { name: 'pam_slurm_adopt', tags: 'pam_slurm_adopt' }
+    - { name: 'install_nhc', tags: 'install_nhc'}
+
+- name: Setup node for use as a virtual cheaha node
+  ansible.builtin.import_playbook: cheaha.yml

openstack-gpu/nodeimage.pkr.hcl

@@ -23,20 +23,6 @@ source "openstack" "image" {
 build {
   sources = ["source.openstack.image"]
 
-  provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["compute"]
-    playbook_file = "./ansible/compute.yml"
-    ansible_env_vars = [
-      "ANSIBLE_SSH_ARGS='-oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedKeyTypes=ssh-rsa'",
-      "ANSIBLE_HOST_KEY_CHECKING=False"
-    ]
-    roles_path = "./ansible/roles"
-    extra_arguments = [
-      "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
-    ]
-  }
-
   provisioner "ansible" {
     user = var.ssh_username
     groups = ["gpu"]