From f979c7af8ebdf60e9a7c9d718e0d87fdbb38ff3c Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen <louistw@uab.edu> Date: Tue, 22 Aug 2023 23:53:16 -0500 Subject: [PATCH] Merge compute playbook into gpu playbook --- ansible/gpu.yml | 5 +++++ openstack-gpu/nodeimage.pkr.hcl | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ansible/gpu.yml b/ansible/gpu.yml index 5d032dc..b6ec44d 100644 --- a/ansible/gpu.yml +++ b/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 diff --git a/openstack-gpu/nodeimage.pkr.hcl b/openstack-gpu/nodeimage.pkr.hcl index e7c8a7d..e200b0a 100644 --- a/openstack-gpu/nodeimage.pkr.hcl +++ b/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"] -- GitLab