Merge pull request #3566 from imduffy15/virtualbox

Allow configurable VRDP bind IP for VirtualBox builders

builder/virtualbox/common/run_config.go

@@ -11,6 +11,7 @@ type RunConfig struct {
 	Headless    bool   `mapstructure:"headless"`
 	RawBootWait string `mapstructure:"boot_wait"`
 
+	VRDPBindAddress string `mapstructure:"vrdp_bind_address"`
 	VRDPPortMin     uint   `mapstructure:"vrdp_port_min"`
 	VRDPPortMax     uint   `mapstructure:"vrdp_port_max"`
 
@@ -22,6 +23,10 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 		c.RawBootWait = "10s"
 	}
 
+	if c.VRDPBindAddress == "" {
+		c.VRDPBindAddress = "127.0.0.1"
+	}
+
 	if c.VRDPPortMin == 0 {
 		c.VRDPPortMin = 5900
 	}

builder/virtualbox/common/run_config_test.go

@@ -35,3 +35,27 @@ func TestRunConfigPrepare_BootWait(t *testing.T) {
 		t.Fatalf("should not have error: %s", errs)
 	}
 }
+
+func TestRunConfigPrepare_VRDPBindAddress(t *testing.T) {
+	var c *RunConfig
+	var errs []error
+
+	// Test a default VRDPBindAddress
+	c = new(RunConfig)
+	errs = c.Prepare(testConfigTemplate(t))
+	if len(errs) > 0 {
+		t.Fatalf("should not have error: %s", errs)
+	}
+
+	if c.VRDPBindAddress != "127.0.0.1" {
+		t.Fatalf("bad value: %s", c.VRDPBindAddress)
+	}
+
+	// Test with a good one
+	c = new(RunConfig)
+	c.VRDPBindAddress = "192.168.0.1"
+	errs = c.Prepare(testConfigTemplate(t))
+	if len(errs) > 0 {
+		t.Fatalf("should not have error: %s", errs)
+	}
+}

builder/virtualbox/common/step_configure_vrdp.go

@@ -21,6 +21,7 @@ import (
 // Produces:
 // vrdp_port unit - The port that VRDP is configured to listen on.
 type StepConfigureVRDP struct {
+	VRDPBindAddress string
 	VRDPPortMin     uint
 	VRDPPortMax     uint
 }
@@ -30,7 +31,7 @@ func (s *StepConfigureVRDP) Run(state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packer.Ui)
 	vmName := state.Get("vmName").(string)
 
-	log.Printf("Looking for available port between %d and %d", s.VRDPPortMin, s.VRDPPortMax)
+	log.Printf("Looking for available port between %d and %d on %s", s.VRDPPortMin, s.VRDPPortMax, s.VRDPBindAddress)
 	var vrdpPort uint
 	portRange := int(s.VRDPPortMax - s.VRDPPortMin)
 
@@ -42,7 +43,7 @@ func (s *StepConfigureVRDP) Run(state multistep.StateBag) multistep.StepAction {
 		}
 
 		log.Printf("Trying port: %d", vrdpPort)
-		l, err := net.Listen("tcp", fmt.Sprintf(":%d", vrdpPort))
+		l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", s.VRDPBindAddress, vrdpPort))
 		if err == nil {
 			defer l.Close()
 			break
@@ -51,7 +52,7 @@ func (s *StepConfigureVRDP) Run(state multistep.StateBag) multistep.StepAction {
 
 	command := []string{
 		"modifyvm", vmName,
-		"--vrdeaddress", "127.0.0.1",
+		"--vrdeaddress", fmt.Sprintf("%s", s.VRDPBindAddress),
 		"--vrdeauthtype", "null",
 		"--vrde", "on",
 		"--vrdeport",
@@ -64,7 +65,7 @@ func (s *StepConfigureVRDP) Run(state multistep.StateBag) multistep.StepAction {
 		return multistep.ActionHalt
 	}
 
-	state.Put("vrdpIp", "127.0.0.1")
+	state.Put("vrdpIp", s.VRDPBindAddress)
 	state.Put("vrdpPort", vrdpPort)
 
 	return multistep.ActionContinue

builder/virtualbox/iso/builder.go

@@ -209,6 +209,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			GuestAdditionsMode: b.config.GuestAdditionsMode,
 		},
 		&vboxcommon.StepConfigureVRDP{
+			VRDPBindAddress: b.config.VRDPBindAddress,
 			VRDPPortMin:     b.config.VRDPPortMin,
 			VRDPPortMax:     b.config.VRDPPortMax,
 		},

builder/virtualbox/ovf/builder.go

@@ -78,6 +78,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			GuestAdditionsMode: b.config.GuestAdditionsMode,
 		},
 		&vboxcommon.StepConfigureVRDP{
+			VRDPBindAddress: b.config.VRDPBindAddress,
 			VRDPPortMin:     b.config.VRDPPortMin,
 			VRDPPortMax:     b.config.VRDPPortMax,
 		},

website/source/docs/builders/virtualbox-iso.html.md

@@ -242,6 +242,10 @@ builder.
     machine, without the file extension. By default this is "packer-BUILDNAME",
     where "BUILDNAME" is the name of the build.
 
+-   `vrdp_bind_address` (string / IP address) - The IP address that should be binded
+     to for VRDP. By default packer will use 127.0.0.1 for this. If you wish to bind
+     to all interfaces use 0.0.0.0
+
 -   `vrdp_port_min` and `vrdp_port_max` (integer) - The minimum and maximum port
     to use for VRDP access to the virtual machine. Packer uses a randomly chosen
     port in this range that appears available. By default this is 5900 to 6000.

website/source/docs/builders/virtualbox-ovf.html.md

@@ -207,6 +207,9 @@ builder.
     is exported. By default this is "packer-BUILDNAME", where "BUILDNAME" is the
     name of the build.
 
+-   `vrdp_bind_address` (string / IP address) - The IP address that should be binded
+     to for VRDP. By default packer will use 127.0.0.1 for this.
+
 -   `vrdp_port_min` and `vrdp_port_max` (integer) - The minimum and maximum port
     to use for VRDP access to the virtual machine. Packer uses a randomly chosen
     port in this range that appears available. By default this is 5900 to 6000.