Merge pull request #761 from mitchellh/do-private-networking

builders/digitalocean: private networking

builder/digitalocean/api.go

@@ -90,13 +90,14 @@ func (d DigitalOceanClient) DestroyKey(id uint) error {
 }
 
 // Creates a droplet and returns it's id
-func (d DigitalOceanClient) CreateDroplet(name string, size uint, image uint, region uint, keyId uint) (uint, error) {
+func (d DigitalOceanClient) CreateDroplet(name string, size uint, image uint, region uint, keyId uint, privateNetworking bool) (uint, error) {
 	params := url.Values{}
 	params.Set("name", name)
 	params.Set("size_id", fmt.Sprintf("%v", size))
 	params.Set("image_id", fmt.Sprintf("%v", image))
 	params.Set("region_id", fmt.Sprintf("%v", region))
 	params.Set("ssh_key_ids", fmt.Sprintf("%v", keyId))
+	params.Set("private_networking", fmt.Sprintf("%v", privateNetworking))
 
 	body, err := NewRequest(d, "droplets/new", params)
 	if err != nil {

builder/digitalocean/builder.go

@@ -30,10 +30,11 @@ type config struct {
 	SizeID   uint   `mapstructure:"size_id"`
 	ImageID  uint   `mapstructure:"image_id"`
 
-	SnapshotName string `mapstructure:"snapshot_name"`
-	DropletName  string `mapstructure:"droplet_name"`
-	SSHUsername  string `mapstructure:"ssh_username"`
-	SSHPort      uint   `mapstructure:"ssh_port"`
+	PrivateNetworking bool   `mapstructure:"private_networking"`
+	SnapshotName      string `mapstructure:"snapshot_name"`
+	DropletName       string `mapstructure:"droplet_name"`
+	SSHUsername       string `mapstructure:"ssh_username"`
+	SSHPort           uint   `mapstructure:"ssh_port"`
 
 	RawSSHTimeout   string `mapstructure:"ssh_timeout"`
 	RawStateTimeout string `mapstructure:"state_timeout"`

builder/digitalocean/builder_test.go

@@ -356,6 +356,39 @@ func TestBuilderPrepare_StateTimeout(t *testing.T) {
 
 }
 
+func TestBuilderPrepare_PrivateNetworking(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	// Test default
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+
+	if b.config.PrivateNetworking != false {
+		t.Errorf("invalid: %s", b.config.PrivateNetworking)
+	}
+
+	// Test set
+	config["private_networking"] = true
+	b = Builder{}
+	warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+
+	if b.config.PrivateNetworking != true {
+		t.Errorf("invalid: %s", b.config.PrivateNetworking)
+	}
+}
+
 func TestBuilderPrepare_SnapshotName(t *testing.T) {
 	var b Builder
 	config := testConfig()

builder/digitalocean/step_create_droplet.go

@@ -19,7 +19,7 @@ func (s *stepCreateDroplet) Run(state multistep.StateBag) multistep.StepAction {
 	ui.Say("Creating droplet...")
 
 	// Create the droplet based on configuration
-	dropletId, err := client.CreateDroplet(c.DropletName, c.SizeID, c.ImageID, c.RegionID, sshKeyId)
+	dropletId, err := client.CreateDroplet(c.DropletName, c.SizeID, c.ImageID, c.RegionID, sshKeyId, c.PrivateNetworking)
 
 	if err != nil {
 		err := fmt.Errorf("Error creating droplet: %s", err)

website/source/docs/builders/digitalocean.html.markdown

@@ -46,6 +46,9 @@ Optional:
 * `size_id` (int) - The ID of the droplet size to use. This defaults to "66,"
   which is the 512MB droplet.
 
+* `private_networking` (bool) - Set to `true` to enable private networking
+  for the droplet being created. This defaults to `false`, or not enabled.
+
 * `snapshot_name` (string) - The name of the resulting snapshot that will
   appear in your account. This must be unique.
   To help make this unique, use a function like `timestamp` (see