From faeef90910218d1832b1002724bbdc222766bb97 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 3 Nov 2021 11:47:29 +0100 Subject: [PATCH] remove ansible plugin from bundled plugins --- command/vendored_plugins.go | 4 ---- main.go | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/command/vendored_plugins.go b/command/vendored_plugins.go index db8b9cd64..a3c6bc101 100644 --- a/command/vendored_plugins.go +++ b/command/vendored_plugins.go @@ -9,8 +9,6 @@ import ( alicloudecsbuilder "github.com/hashicorp/packer-plugin-alicloud/builder/ecs" alicloudimportpostprocessor "github.com/hashicorp/packer-plugin-alicloud/post-processor/alicloud-import" - ansibleprovisioner "github.com/hashicorp/packer-plugin-ansible/provisioner/ansible" - ansiblelocalprovisioner "github.com/hashicorp/packer-plugin-ansible/provisioner/ansible-local" chefclientprovisioner "github.com/hashicorp/packer-plugin-chef/provisioner/chef-client" chefsoloprovisioner "github.com/hashicorp/packer-plugin-chef/provisioner/chef-solo" cloudstackbuilder "github.com/hashicorp/packer-plugin-cloudstack/builder/cloudstack" @@ -93,8 +91,6 @@ var VendoredBuilders = map[string]packersdk.Builder{ // VendoredProvisioners are provisioner components that were once bundled with the // Packer core, but are now being imported from their counterpart plugin repos var VendoredProvisioners = map[string]packersdk.Provisioner{ - "ansible": new(ansibleprovisioner.Provisioner), - "ansible-local": new(ansiblelocalprovisioner.Provisioner), "chef-client": new(chefclientprovisioner.Provisioner), "chef-solo": new(chefsoloprovisioner.Provisioner), "converge": new(convergeprovisioner.Provisioner), diff --git a/main.go b/main.go index e8d16e465..a38db8e6d 100644 --- a/main.go +++ b/main.go @@ -364,8 +364,8 @@ func loadConfig() (*config, error) { "amazon-secretsmanager": "github.com/hashicorp/amazon", }, ProvisionerRedirects: map[string]string{ - // "ansible": "github.com/hashicorp/ansible", - // "ansible-local": "github.com/hashicorp/ansible", + "ansible": "github.com/hashicorp/ansible", + "ansible-local": "github.com/hashicorp/ansible", "azure-dtlartifact": "github.com/hashicorp/azure", },