Commit 0cfb7564 authored by Nathan Sullivan's avatar Nathan Sullivan

lets try a string instead of a bool for AssociatePublicIpAddress

parent 5df7bc0a
...@@ -7,7 +7,7 @@ package chroot ...@@ -7,7 +7,7 @@ package chroot
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/common" "github.com/mitchellh/packer/common"
......
...@@ -3,7 +3,7 @@ package chroot ...@@ -3,7 +3,7 @@ package chroot
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -2,7 +2,7 @@ package chroot ...@@ -2,7 +2,7 @@ package chroot
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -2,8 +2,8 @@ package chroot ...@@ -2,8 +2,8 @@ package chroot
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"log" "log"
......
...@@ -2,7 +2,7 @@ package chroot ...@@ -2,7 +2,7 @@ package chroot
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -3,7 +3,7 @@ package chroot ...@@ -3,7 +3,7 @@ package chroot
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -2,7 +2,7 @@ package chroot ...@@ -2,7 +2,7 @@ package chroot
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
) )
......
...@@ -2,7 +2,7 @@ package common ...@@ -2,7 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"strings" "strings"
"unicode" "unicode"
......
...@@ -2,7 +2,7 @@ package common ...@@ -2,7 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
) )
......
...@@ -2,8 +2,8 @@ package common ...@@ -2,8 +2,8 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"log" "log"
"strings" "strings"
......
package common package common
import ( import (
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
) )
// BlockDevice // BlockDevice
......
package common package common
import ( import (
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"reflect" "reflect"
"testing" "testing"
) )
......
...@@ -22,7 +22,7 @@ type RunConfig struct { ...@@ -22,7 +22,7 @@ type RunConfig struct {
SecurityGroupId string `mapstructure:"security_group_id"` SecurityGroupId string `mapstructure:"security_group_id"`
SecurityGroupIds []string `mapstructure:"security_group_ids"` SecurityGroupIds []string `mapstructure:"security_group_ids"`
SubnetId string `mapstructure:"subnet_id"` SubnetId string `mapstructure:"subnet_id"`
AssociatePublicIpAddress bool `mapstructure:"associate_public_ip_address"` AssociatePublicIpAddress string `mapstructure:"associate_public_ip_address"`
TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name"` TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name"`
VpcId string `mapstructure:"vpc_id"` VpcId string `mapstructure:"vpc_id"`
AvailabilityZone string `mapstructure:"availability_zone"` AvailabilityZone string `mapstructure:"availability_zone"`
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
gossh "code.google.com/p/go.crypto/ssh" gossh "code.google.com/p/go.crypto/ssh"
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/communicator/ssh" "github.com/mitchellh/packer/communicator/ssh"
"time" "time"
......
...@@ -3,7 +3,7 @@ package common ...@@ -3,7 +3,7 @@ package common
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"log" "log"
"time" "time"
......
...@@ -2,8 +2,8 @@ package common ...@@ -2,8 +2,8 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
) )
......
...@@ -2,8 +2,8 @@ package common ...@@ -2,8 +2,8 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
) )
......
...@@ -2,7 +2,7 @@ package common ...@@ -2,7 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"os" "os"
......
...@@ -2,8 +2,8 @@ package common ...@@ -2,8 +2,8 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/aws" "github.com/CpuID/goamz/aws"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
) )
......
...@@ -2,7 +2,7 @@ package common ...@@ -2,7 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"io/ioutil" "io/ioutil"
...@@ -18,7 +18,7 @@ type StepRunSourceInstance struct { ...@@ -18,7 +18,7 @@ type StepRunSourceInstance struct {
SourceAMI string SourceAMI string
IamInstanceProfile string IamInstanceProfile string
SubnetId string SubnetId string
AssociatePublicIpAddress bool AssociatePublicIpAddress string
AvailabilityZone string AvailabilityZone string
BlockDevices BlockDevices BlockDevices BlockDevices
......
...@@ -2,7 +2,7 @@ package common ...@@ -2,7 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/common/uuid" "github.com/mitchellh/packer/common/uuid"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -7,7 +7,7 @@ package ebs ...@@ -7,7 +7,7 @@ package ebs
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/common" "github.com/mitchellh/packer/common"
......
...@@ -2,7 +2,7 @@ package ebs ...@@ -2,7 +2,7 @@ package ebs
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -2,7 +2,7 @@ package ebs ...@@ -2,7 +2,7 @@ package ebs
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
......
...@@ -5,7 +5,7 @@ package instance ...@@ -5,7 +5,7 @@ package instance
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/common" "github.com/mitchellh/packer/common"
......
...@@ -2,7 +2,7 @@ package instance ...@@ -2,7 +2,7 @@ package instance
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
) )
......
...@@ -2,7 +2,7 @@ package instance ...@@ -2,7 +2,7 @@ package instance
import ( import (
"fmt" "fmt"
"github.com/mitchellh/goamz/ec2" "github.com/CpuID/goamz/ec2"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/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