Gofmt, remove network card, examples centos7, fix gopkg, fixing CPU_limit

Gopkg.toml

@@ -1,10 +1,10 @@
 [[constraint]]
  name = "github.com/hashicorp/packer"
- version = "~1.2"
+ version = "~1.2.0"
 
 [[constraint]]
  name = "github.com/vmware/govmomi"
- version = "~0.17"
+ version = "~0.17.0"
 
 [[override]]
  name = "github.com/masterzen/azure-sdk-for-go"

README.md

@@ -17,6 +17,15 @@ This a plugin for [HashiCorp Packer](https://www.packer.io/). It uses native vSp
 * Download binaries from the [releases page](https://github.com/jetbrains-infra/packer-builder-vsphere/releases).
 * [Install](https://www.packer.io/docs/extending/plugins.html#installing-plugins) the plugins, or simply put them into the same directory with JSON templates. On Linux and macOS run `chmod +x` on the files.
 
+##Build
+
+Use docker and docker-compose
+```
+docker-compose up
+```
+the binary will be in bin/ folder
+
+
 ## Examples
 
 See complete Ubuntu, Windows, and macOS templates in the [examples folder](https://github.com/jetbrains-infra/packer-builder-vsphere/tree/master/examples/).
@@ -95,6 +104,7 @@ See complete Ubuntu, Windows, and macOS templates in the [examples folder](https
 
 ### Postprocessing
 
+* `remove_network_card`(boolean) - Remove all network cards before creating a snapshot/template if set to `true`. Defaults to `false`.
 * `create_snapshot`(boolean) - Create a snapshot when set to `true`, so the VM can be used as a base for linked clones. Defaults to `false`.
 * `convert_to_template`(boolean) - Convert VM to a template. Defaults to `false`.
 

build.sh

@@ -8,6 +8,8 @@ export GOARCH=amd64
 mkdir -p bin
 rm -f bin/*
 
+gofmt -e -w .
+
 GOOS=darwin go build -o bin/packer-builder-vsphere-iso.macos ./cmd/iso
 GOOS=linux go build -o bin/packer-builder-vsphere-iso.linux ./cmd/iso
 GOOS=windows go build -o bin/packer-builder-vsphere-iso.exe ./cmd/iso

clone/builder.go

@@ -2,11 +2,11 @@ package clone
 
 import (
  packerCommon "github.com/hashicorp/packer/common"
+ "github.com/hashicorp/packer/helper/communicator"
+ "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
  "github.com/jetbrains-infra/packer-builder-vsphere/common"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "github.com/hashicorp/packer/helper/multistep"
- "github.com/hashicorp/packer/helper/communicator"
 )
 
 type Builder struct {
@@ -67,6 +67,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
  }
 
  steps = append(steps,
+ &common.StepRemoveNetworkCard{
+ RemoveNetworkCard: b.config.RemoveNetworkCard,
+ },
  &common.StepCreateSnapshot{
  CreateSnapshot: b.config.CreateSnapshot,
  },

clone/builder_acc_test.go

@@ -5,8 +5,8 @@ import (
  commonT "github.com/jetbrains-infra/packer-builder-vsphere/common/testing"
 
  "github.com/hashicorp/packer/packer"
- "testing"
  "github.com/jetbrains-infra/packer-builder-vsphere/common"
+ "testing"
 )
 
 func TestCloneBuilderAcc_default(t *testing.T) {

clone/config.go

@@ -3,10 +3,10 @@ package clone
 import (
  packerCommon "github.com/hashicorp/packer/common"
  "github.com/hashicorp/packer/helper/communicator"
+ "github.com/hashicorp/packer/helper/config"
  "github.com/hashicorp/packer/packer"
  "github.com/hashicorp/packer/template/interpolate"
  "github.com/jetbrains-infra/packer-builder-vsphere/common"
- "github.com/hashicorp/packer/helper/config"
 )
 
 type Config struct {
@@ -18,12 +18,13 @@ type Config struct {
  common.HardwareConfig `mapstructure:",squash"`
  common.ConfigParamsConfig `mapstructure:",squash"`
 
- common.RunConfig  `mapstructure:",squash"`
- Comm communicator.Config `mapstructure:",squash"`
- common.ShutdownConfig  `mapstructure:",squash"`
+ common.RunConfig `mapstructure:",squash"`
+ Comm  communicator.Config `mapstructure:",squash"`
+ common.ShutdownConfig `mapstructure:",squash"`
 
  CreateSnapshot bool `mapstructure:"create_snapshot"`
  ConvertToTemplate bool `mapstructure:"convert_to_template"`
+ RemoveNetworkCard bool `mapstructure:"remove_network_card"`
 
  ctx interpolate.Context
 }

clone/config_test.go

@@ -25,7 +25,7 @@ func TestCloneConfig_Timeout(t *testing.T) {
  raw["shutdown_timeout"] = "3m"
  conf, warns, err := NewConfig(raw)
  testConfigOk(t, warns, err)
- if conf.ShutdownConfig.Timeout != 3 * time.Minute {
+ if conf.ShutdownConfig.Timeout != 3*time.Minute {
  t.Fatalf("shutdown_timeout sould be equal 3 minutes, got %v", conf.ShutdownConfig.Timeout)
  }
 }
@@ -41,13 +41,13 @@ func TestCloneConfig_RAMReservation(t *testing.T) {
 func minimalConfig() map[string]interface{} {
  return map[string]interface{}{
  "vcenter_server": "vcenter.domain.local",
- "username": "root",
- "password": "vmware",
- "template": "ubuntu",
- "vm_name": "vm1",
- "host": "esxi1.domain.local",
- "ssh_username": "root",
- "ssh_password": "secret",
+ "username":  "root",
+ "password":  "vmware",
+ "template":  "ubuntu",
+ "vm_name":  "vm1",
+ "host":  "esxi1.domain.local",
+ "ssh_username":  "root",
+ "ssh_password":  "secret",
  }
 }
 

clone/step_clone.go

@@ -1,12 +1,12 @@
 package clone
 
 import (
+ "context"
+ "fmt"
  "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
- "fmt"
- "github.com/jetbrains-infra/packer-builder-vsphere/driver"
  "github.com/jetbrains-infra/packer-builder-vsphere/common"
- "context"
+ "github.com/jetbrains-infra/packer-builder-vsphere/driver"
 )
 
 type CloneConfig struct {

common/config_ssh.go

@@ -5,9 +5,9 @@ import (
  "io/ioutil"
 
  packerssh "github.com/hashicorp/packer/communicator/ssh"
+ "github.com/hashicorp/packer/helper/communicator"
  "github.com/hashicorp/packer/helper/multistep"
  "golang.org/x/crypto/ssh"
- "github.com/hashicorp/packer/helper/communicator"
 )
 
 func CommHost(state multistep.StateBag) (string, error) {

common/step_config_params.go

@@ -1,11 +1,11 @@
 package common
 
 import (
+ "context"
+ "fmt"
+ "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "github.com/hashicorp/packer/helper/multistep"
- "fmt"
- "context"
 )
 
 type ConfigParamsConfig struct {

common/step_connect.go

@@ -1,10 +1,10 @@
 package common
 
 import (
- "github.com/hashicorp/packer/helper/multistep"
+ "context"
  "fmt"
+ "github.com/hashicorp/packer/helper/multistep"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "context"
 )
 
 type ConnectConfig struct {

common/step_hardware.go

@@ -1,25 +1,25 @@
 package common
 
 import (
- "github.com/hashicorp/packer/packer"
- "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "github.com/hashicorp/packer/helper/multistep"
  "context"
  "fmt"
+ "github.com/hashicorp/packer/helper/multistep"
+ "github.com/hashicorp/packer/packer"
+ "github.com/jetbrains-infra/packer-builder-vsphere/driver"
 )
 
 type HardwareConfig struct {
- CPUs  int32 `mapstructure:"CPUs"`
- CPUReservation  int64 `mapstructure:"CPU_reservation"`
- CPULimit  int64 `mapstructure:"CPU_limit"`
- CpuHotAddEnabled  bool `mapstructure:"CPU_hot_plug"`
+ CPUs int32 `mapstructure:"CPUs"`
+ CPUReservation int64 `mapstructure:"CPU_reservation"`
+ CPULimit int64 `mapstructure:"CPU_limit"`
+ CpuHotAddEnabled bool `mapstructure:"CPU_hot_plug"`
 
  RAM int64 `mapstructure:"RAM"`
  RAMReservation int64 `mapstructure:"RAM_reservation"`
  RAMReserveAll bool `mapstructure:"RAM_reserve_all"`
  MemoryHotAddEnabled bool `mapstructure:"RAM_hot_plug"`
 
- NestedHV  bool  `mapstructure:"NestedHV"`
+ NestedHV bool `mapstructure:"NestedHV"`
 }
 
 func (c *HardwareConfig) Prepare() []error {
@@ -29,6 +29,10 @@ func (c *HardwareConfig) Prepare() []error {
  errs = append(errs, fmt.Errorf("'RAM_reservation' and 'RAM_reserve_all' cannot be used together"))
  }
 
+ if c.CPULimit == 0 {
+ c.CPULimit = -1
+ }
+
  return errs
 }
 

common/step_remove_network_card.go

@@ -0,0 +1,38 @@
+package common
+
+import (
+ "context"
+ "github.com/hashicorp/packer/helper/multistep"
+ "github.com/hashicorp/packer/packer"
+ "github.com/jetbrains-infra/packer-builder-vsphere/driver"
+ "github.com/vmware/govmomi/vim25/types"
+)
+
+type StepRemoveNetworkCard struct {
+ RemoveNetworkCard bool
+}
+
+func (s *StepRemoveNetworkCard) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+ ui := state.Get("ui").(packer.Ui)
+ vm := state.Get("vm").(*driver.VirtualMachine)
+
+ if s.RemoveNetworkCard {
+ ui.Say("Deleting Network Cards...")
+ devices, err := vm.Devices()
+ if err != nil {
+ state.Put("error", err)
+ return multistep.ActionHalt
+ }
+
+ cards := devices.SelectByType((*types.VirtualEthernetCard)(nil))
+
+ if err = vm.RemoveDevice(true, cards...); err != nil {
+ state.Put("error", err)
+ return multistep.ActionHalt
+ }
+ }
+
+ return multistep.ActionContinue
+}
+
+func (s *StepRemoveNetworkCard) Cleanup(state multistep.StateBag) {}

common/step_run.go

@@ -1,11 +1,11 @@
 package common
 
 import (
+ "context"
  "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
  "strings"
- "context"
 )
 
 type RunConfig struct {
@@ -40,7 +40,7 @@ func (s *StepRun) Run(_ context.Context, state multistep.StateBag) multistep.Ste
  ui.Say("Power on VM...")
  err := vm.PowerOn()
  if err != nil {
- state.Put("error",err)
+ state.Put("error", err)
  return multistep.ActionHalt
  }
 

common/step_shutdown.go

@@ -1,21 +1,21 @@
 package common
 
 import (
+ "bytes"
+ "context"
+ "fmt"
  "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
- "fmt"
+ "github.com/jetbrains-infra/packer-builder-vsphere/driver"
  "log"
  "time"
- "bytes"
- "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "context"
 )
 
 type ShutdownConfig struct {
  Command string `mapstructure:"shutdown_command"`
  RawTimeout string `mapstructure:"shutdown_timeout"`
 
- Timeout  time.Duration
+ Timeout time.Duration
 }
 
 func (c *ShutdownConfig) Prepare() []error {

common/step_snapshot.go

@@ -1,13 +1,13 @@
 package common
 
 import (
+ "context"
  "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "context"
 )
 
-type StepCreateSnapshot struct{
+type StepCreateSnapshot struct {
  CreateSnapshot bool
 }
 

common/step_template.go

@@ -1,13 +1,13 @@
 package common
 
 import (
+ "context"
  "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
- "context"
 )
 
-type StepConvertToTemplate struct{
+type StepConvertToTemplate struct {
  ConvertToTemplate bool
 }
 

common/step_wait_for_ip.go

@@ -1,12 +1,12 @@
 package common
 
 import (
- "github.com/hashicorp/packer/helper/multistep"
+ "context"
  "fmt"
+ "github.com/hashicorp/packer/helper/multistep"
  "github.com/hashicorp/packer/packer"
  "github.com/jetbrains-infra/packer-builder-vsphere/driver"
  "time"
- "context"
 )
 
 type StepWaitForIp struct{}