Commit 15c2ca95 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

Merge pull request #1065 from brettporter/gce_instance_name

builder/googlecompute: configure instance name
parents f033991c e1690135
......@@ -5,6 +5,7 @@ import (
"fmt"
"time"
"github.com/mitchellh/packer/common/uuid"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/packer"
)
......@@ -19,6 +20,7 @@ type Config struct {
ClientSecretsFile string `mapstructure:"client_secrets_file"`
ImageName string `mapstructure:"image_name"`
ImageDescription string `mapstructure:"image_description"`
InstanceName string `mapstructure:"instance_name"`
MachineType string `mapstructure:"machine_type"`
Metadata map[string]string `mapstructure:"metadata"`
Network string `mapstructure:"network"`
......@@ -70,6 +72,10 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
c.ImageName = "packer-{{timestamp}}"
}
if c.InstanceName == "" {
c.InstanceName = fmt.Sprintf("packer-%s", uuid.TimeOrderedUUID())
}
if c.MachineType == "" {
c.MachineType = "n1-standard-1"
}
......
......@@ -6,7 +6,6 @@ import (
"time"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/common/uuid"
"github.com/mitchellh/packer/packer"
)
......@@ -25,7 +24,7 @@ func (s *StepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
ui := state.Get("ui").(packer.Ui)
ui.Say("Creating instance...")
name := fmt.Sprintf("packer-%s", uuid.TimeOrderedUUID())
name := config.InstanceName
errCh, err := driver.RunInstance(&InstanceConfig{
Description: "New instance created by Packer",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment