Commit Graph

283 Commits

Author SHA1 Message Date
Megan Marsh 4178625afb re-add winrm_no_proxy option. Winrm code needs to be modified in order to read no_proxy env var when client is created rather than when net/http library is instantiated. 2020-06-16 10:27:30 -07:00
Adrien Delorme 40947c2bf6
HCL2: generate hcl tags with go-cty tags too (#9306)
This will allow to generate the config files:

```go
package main

import (
	"fmt"

	"github.com/hashicorp/hcl/v2/gohcl"
	"github.com/hashicorp/hcl/v2/hclwrite"
	"github.com/hashicorp/packer/builder/alicloud/ecs"
)

func main() {
	name := "name"
	app := ecs.FlatConfig{
		AlicloudImageName: &name,
		ECSSystemDiskMapping: &ecs.FlatAlicloudDiskDevice{
			DiskName: &name,
		},
	}

	f := hclwrite.NewEmptyFile()
	block := gohcl.EncodeAsBlock(&app, `source "something" "something"`)
	f.Body().AppendBlock(block)
	fmt.Printf("%s", f.Bytes())
}

```

Will output:

```
source "something" "something" {
  packer_user_variables      = null
  packer_sensitive_variables = null
  image_name                 = "name"
  image_share_account        = null
  image_unshare_account      = null
  image_copy_regions         = null
  image_copy_names           = null
  tags                       = null
  tag                        = null
  system_disk_mapping        = { disk_category = null, disk_delete_with_instance = null, disk_descri
ption = null, disk_device = null, disk_encrypted = null, disk_name = "name", disk_size = null, disk_
snapshot_id = null }
  image_disk_mappings        = null
  ssh_remote_tunnels         = null
  ssh_local_tunnels          = null
  ssh_public_key             = null
  ssh_private_key            = null
}
```

This is a good first step for #9015 and #9282 

fix #9304
2020-05-28 11:19:00 +02:00
Megan Marsh fe472f45ae don't put error in state, or we'll fail. 2020-05-12 16:51:40 -07:00
Megan Marsh 807a09a770 don't error if metadata can't be set. Old versions of openstack don't seem to play nicely with this API call 2020-05-12 16:51:40 -07:00
Megan Marsh 7e0cfd8b77 add undocumented tag to struct-markdown generator so that we can leave internal-use-only fields out of docs 2020-05-01 10:31:38 -07:00
Adrien Delorme 840e67f775
HCL2: when we see a map generate an attribute spec instead of a block spec (#9035)
* mapstructure-to-hcl2: when we see a map generate an attribute spec and not a block spec

this will alow to do

tags = {
 key = "value"
}

instead of

tags {
  key = "value"
}

This will also enable using variables directly for those tags

* generate code

* update tests
2020-04-14 16:05:13 +02:00
Jeff Escalante 2999934326
fix generation script, bugfixes in source comments, update website paths in primary codebase 2020-04-07 17:53:22 -04:00
Jorge Marey 2c6f0968b3
Allow accepting image for the members in OpenStack builder (#8931)
* Allow accepting image for the members in OS builder

* Add more documentation to image_auto_accept_members parameter
2020-03-23 17:07:00 -04:00
Megan Marsh 6008f911fd
Merge pull request #8847 from takaishi/support-keyboard-interactive
communicator/ssh: support keyboard-interactive auth to connect bastion
2020-03-13 11:48:12 -07:00
r_takaishi f50ff1d270 make generate 2020-03-13 11:29:42 +09:00
Wilken Rivera 7b705545d9
docs: Various doc clean-ups to fix code block formatting and syntax highlighting (#8868) 2020-03-12 15:05:08 +01:00
Megan Marsh d252a24b82 allow user to set winrm_host override like we do ssh_host override 2020-01-30 15:22:22 -08:00
Sylvia Moss dc31bad539
Sharing info with post-processors via artifact (#8632) 2020-01-30 11:27:58 +01:00
Adrien Delorme 13ea97a1df mapstructure-to-hcl2: make basic named types pointers ( optional ) 2020-01-07 12:46:27 +01:00
Adrien Delorme 731904d3d2 mapstructure-to-hcl2: use accessor for named types and not named type + go genrate + tests 2020-01-07 11:44:22 +01:00
Adrien Delorme 4b7132c87c Merge remote-tracking branch 'origin/master' into sharing_info 2019-12-17 11:57:09 +01:00
Adrien Delorme 0785c2f6fc
build using HCL2 (#8423)
This follows #8232 which added the code to generate the code required to parse
HCL files for each packer component.

All old config files of packer will keep on working the same. Packer takes one
argument. When a directory is passed, all files in the folder with a name
ending with  “.pkr.hcl” or “.pkr.json” will be parsed using the HCL2 format.
When a file ending with “.pkr.hcl” or “.pkr.json” is passed it will be parsed
using the HCL2 format. For every other case; the old packer style will be used.

## 1. the hcl2template pkg can create a packer.Build from a set of HCL (v2) files

I had to make the packer.coreBuild (which is our one and only packer.Build ) a public struct with public fields

## 2. Components interfaces get a new ConfigSpec Method to read a file from an HCL file.

  This is a breaking change for packer plugins.

a packer component can be a: builder/provisioner/post-processor

each component interface now gets a `ConfigSpec() hcldec.ObjectSpec`
which allows packer to tell what is the layout of the hcl2 config meant
to configure that specific component.

This ObjectSpec is sent through the wire (RPC) and a cty.Value is now
sent through the already existing configuration entrypoints:

 Provisioner.Prepare(raws ...interface{}) error
 Builder.Prepare(raws ...interface{}) ([]string, error)
 PostProcessor.Configure(raws ...interface{}) error

close #1768


Example hcl files:

```hcl
// file amazon-ebs-kms-key/run.pkr.hcl
build {
    sources = [
        "source.amazon-ebs.first",
    ]

    provisioner "shell" {
        inline = [
            "sleep 5"
        ]
    }

    post-processor "shell-local" {
        inline = [
            "sleep 5"
        ]
    }
}

// amazon-ebs-kms-key/source.pkr.hcl

source "amazon-ebs" "first" {

    ami_name = "hcl2-test"
    region = "us-east-1"
    instance_type = "t2.micro"

    kms_key_id = "c729958f-c6ba-44cd-ab39-35ab68ce0a6c"
    encrypt_boot = true
    source_ami_filter {
        filters {
          virtualization-type = "hvm"
          name =  "amzn-ami-hvm-????.??.?.????????-x86_64-gp2"
          root-device-type = "ebs"
        }
        most_recent = true
        owners = ["amazon"]
    }
    launch_block_device_mappings {
        device_name = "/dev/xvda"
        volume_size = 20
        volume_type = "gp2"
        delete_on_termination = "true"
    }
    launch_block_device_mappings {
        device_name = "/dev/xvdf"
        volume_size = 500
        volume_type = "gp2"
        delete_on_termination = true
        encrypted = true
    }

    ami_regions = ["eu-central-1"]
    run_tags {
        Name = "packer-solr-something"
        stack-name = "DevOps Tools"
    }
    
    communicator = "ssh"
    ssh_pty = true
    ssh_username = "ec2-user"
    associate_public_ip_address = true
}
```
2019-12-17 11:25:56 +01:00
Megan Marsh 0f6d1beccf add an extra string array to the Prepare() return values in the builder interfaces; this sets up the ability for builders to give the provisioners custom user-accessible build-time variables. 2019-12-16 21:23:05 -08:00
Megan Marsh 84063d2132 implement ID and Type values in the provisioner template info sharing 2019-12-13 11:57:01 -08:00
Megan Marsh 3389d843f0 update all provisioners that used the winrmpassword tooling to use the new generateddata option 2019-12-12 16:42:53 -08:00
Lars Lehtonen b68c75ea3e
builder/openstack: remove dead testConfig() function 2019-10-31 13:36:00 -07:00
Andrey Kaipov 5da5b00e1c [builder/openstack] adds option to discover provisioning network 2019-10-29 13:02:27 -04:00
Kevin Puetz 00d0297d26 Merge branch 'master' into issue8178 2019-10-23 00:34:38 -05:00
Adrien Delorme 078ba7c8c3 commit old code generation tool
for history
2019-10-15 12:56:42 +02:00
Kevin Puetz 6e069c94e8 fix: set openstack metadata for use_blockstorage_volume
Also set os-set_image_metadata on the tempoary volume before uploading
(volume metadata does not automatically become image metadata)
so the uploaded image will be created with the desired metadata
2019-10-02 17:59:13 -05:00
Marek Winkler 0bd256326f builder/openstack: Fix interface conversion panic when attempting to find a volume when not using volumes 2019-10-02 22:16:18 +02:00
Marek Winkler 7e6f58f699 builder/openstack: fix issue 5575 - support shutdown by Sysprep 2019-10-02 21:07:41 +02:00
Adrien Delorme 3fe9d52e3f Merge remote-tracking branch 'origin/master' into scrape_doc_to_builder_struct_config 2019-09-20 11:15:44 +02:00
Lars Lehtonen 6c1ce2bd9a builder/openstack: Fix dropped error 2019-09-16 06:26:56 -07:00
Adrien Delorme d135106171 fix more docs 2019-08-27 09:50:43 +02:00
Adrien Delorme 2db109d55b Merge branch 'master' into scrape_doc_to_builder_struct_config 2019-08-23 17:37:53 +02:00
Pratyush Singhal dbb50337bc
fix: out of scope blockStorageClient nil value issue
Co-Authored-By: Adrien Delorme <azr@users.noreply.github.com>
2019-08-22 20:50:46 +05:30
Adrien Delorme 4cb7c30987 Merge remote-tracking branch 'origin/master' into scrape_doc_to_builder_struct_config 2019-08-21 16:44:23 +02:00
psinghal20 bbd71136dc
fix: move adding metadata step after waiting for uploading step
Signed-off-by: psinghal20 <psinghal20@gmail.com>
2019-08-21 15:45:46 +05:30
Justin Georgeson c0ee859559 OpenStack builder store WinRM password for provisioners to use 2019-08-01 19:02:36 -05:00
Megan Marsh 3d22535742
Merge pull request #7884 from jprorama/fix-7171
[WIP] Fix #7171: select instance network on which to assign floating ip
2019-07-25 11:57:24 -07:00
Megan Marsh 54a7b4f377 update comments and docs 2019-07-22 11:54:42 -07:00
y-kuno 6305c555df Add openstack image min_disk option 2019-07-22 11:44:34 -07:00
Megan Marsh 975ee377b2
Merge pull request #7792 from psinghal20/issue-7721
set openstack image metadata with use_blockstorage_volume
2019-07-18 11:58:01 -07:00
John-Paul Robinson 038e9f316c Clean patch formatting with make fmt 2019-07-17 17:10:52 -05:00
John-Paul Robinson 5fe9f3980d Fix #7171: select instance network on which to assign floating ip
Add config parameter instance_floating_ip_net to control
floating ip assignment for a multi-homed instances.  This ensures
the floating ip can be correctly assigned to the instance port
that is connected to the preferred network for floating ip assignment.

This avoids the default first-returned selection method which may
choose a network to which floating ip's can't be assigned,
e.g. because that network is not reachable from the floating ip
network.
2019-07-17 17:00:28 -05:00
Megan Marsh ba66d5d857
Merge pull request #7831 from hashicorp/fix_ssh_interface
Revert "move SSHInterface/SSHIPVersion fields to communitator.Config …
2019-07-03 16:23:00 -07:00
Megan Marsh 0cfe8e7070 allow ssh_host override for OpenStack 2019-07-02 14:00:51 -07:00
Megan Marsh 6ad975f296 Revert "move SSHInterface/SSHIPVersion fields to communitator.Config struct"
This reverts commit b0c09087a2.
2019-07-02 10:46:10 -07:00
Pratyush singhal 6c8421e802 fix: fix volumes.Delete method call
Signed-off-by: Pratyush singhal <psinghal20@gmail.com>
2019-07-01 12:56:00 +05:30
Pratyush singhal cf8bfa56f0 fix: set openstack image metadata with use_blockstorage_volume
Signed-off-by: Pratyush singhal <psinghal20@gmail.com>
2019-07-01 12:56:00 +05:30
Adrien Delorme 67d96d5103 openstack: document using partials from struct conf 2019-06-20 15:28:27 +02:00
Adrien Delorme 4bf6a56d71 split communitacor.SSH & communitacor.WinRM to facilitate documentation
put doc for communicator into the struct
2019-06-06 16:55:24 +02:00
Adrien Delorme 4399684372 make fmt autogenerated docs 2019-06-06 16:29:25 +02:00
Adrien Delorme e6cbb013ba add // go:generate struct-markdown to all previously edited files 2019-06-05 16:42:18 +02:00