diff --git a/openstack.pkrvars.hcl.example b/openstack.pkrvars.hcl.example index 7f2a2f9d3137eeada3fee7a862db5a69927a39de..fd2894836b2838fe25ddf2fccd5c9569fbe6a754 100644 --- a/openstack.pkrvars.hcl.example +++ b/openstack.pkrvars.hcl.example @@ -22,7 +22,3 @@ auto_accept_members = false image_tags = [] # The username to connect to SSH with. Used by Packer build section ssh_username = "centos" -# Key that will be used for SSH with the machine. Must match key pair name loaded up into the remote. -ssh_keypair_name = "" -# Path to the private key file to use to authenticate with SSH. -ssh_private_key_file = "" diff --git a/openstack/nodeimage.pkr.hcl b/openstack/nodeimage.pkr.hcl index 5cc075a38b0385988c1b1a1876c04712863d6d53..bd97f280b7b3e662b818270319d053a793c847e0 100644 --- a/openstack/nodeimage.pkr.hcl +++ b/openstack/nodeimage.pkr.hcl @@ -17,9 +17,6 @@ source "openstack" "image" { security_groups = var.security_groups ssh_username = var.ssh_username - ssh_keypair_name = var.ssh_keypair_name - ssh_private_key_file = var.ssh_private_key_file - } build { @@ -34,16 +31,9 @@ build { } provisioner "ansible" { use_proxy = false - ssh_authorized_key_file = "/home/ubuntu/.ssh/id_rsa.pub" ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"] playbook_file = "../CRI_XCBC/ood-packer.yaml" roles_path = "./ansible/roles" inventory_file = "../CRI_XCBC/hosts" - extra_arguments = [ - "--extra-vars", "root_ssh_key='${var.root_ssh_key}'", - "--private-key=${var.ssh_private_key_file}", - "--user=centos", - #"-vvvv" - ] } } diff --git a/openstack/variables.pkr.hcl b/openstack/variables.pkr.hcl index 175ca17edf8b952ec5a041cc8209720473d2ac8d..5082805e08faa68325e6cd7b5ec18bb89467c623 100644 --- a/openstack/variables.pkr.hcl +++ b/openstack/variables.pkr.hcl @@ -76,13 +76,3 @@ variable "ssh_username" { default = "centos" description = "The default username to use for SSH" } - -variable "ssh_keypair_name" { - type = string - description = "SSH keypair to use from OS project" -} - -variable "ssh_private_key_file" { - type = string - description = "Private key file" -}