From 0e4b4a8d9efe01ece3644e09aec38d9280b235a3 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen <louistw@uab.edu> Date: Thu, 31 Aug 2023 15:10:17 -0500 Subject: [PATCH] Remove ansible_env_vars from templates --- openstack-compute/nodeimage.pkr.hcl | 5 +---- openstack-gpu/nodeimage.pkr.hcl | 4 ---- openstack/nodeimage.pkr.hcl | 4 ---- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-compute/nodeimage.pkr.hcl index c185672..f2b007c 100644 --- a/openstack-compute/nodeimage.pkr.hcl +++ b/openstack-compute/nodeimage.pkr.hcl @@ -26,15 +26,12 @@ build { 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 use_proxy = false diff --git a/openstack-gpu/nodeimage.pkr.hcl b/openstack-gpu/nodeimage.pkr.hcl index e200b0a..eedd1a3 100644 --- a/openstack-gpu/nodeimage.pkr.hcl +++ b/openstack-gpu/nodeimage.pkr.hcl @@ -27,10 +27,6 @@ build { user = var.ssh_username groups = ["gpu"] playbook_file = "./ansible/gpu.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}'" diff --git a/openstack/nodeimage.pkr.hcl b/openstack/nodeimage.pkr.hcl index 539ec77..509ae3c 100644 --- a/openstack/nodeimage.pkr.hcl +++ b/openstack/nodeimage.pkr.hcl @@ -26,10 +26,6 @@ build { user = var.ssh_username groups = ["base"] playbook_file = "./ansible/base.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}'" -- GitLab