From 038e9f316ca9de9b19d593a013c44cd57933618b Mon Sep 17 00:00:00 2001
From: John-Paul Robinson <jpr@uab.edu>
Date: Wed, 17 Jul 2019 17:10:52 -0500
Subject: [PATCH] Clean patch formatting with make fmt

---
 builder/openstack/builder.go          |  8 +++---
 builder/openstack/networks.go         |  7 +++---
 builder/openstack/run_config.go       | 36 +++++++++++++--------------
 builder/openstack/step_allocate_ip.go |  8 +++---
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index 7ff34b869..e0e02edf5 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -126,10 +126,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Wait: b.config.RackconnectWait,
 		},
 		&StepAllocateIp{
-			FloatingIPNetwork: b.config.FloatingIPNetwork,
-			FloatingIP:        b.config.FloatingIP,
-			ReuseIPs:          b.config.ReuseIPs,
-			InstanceFloatingIPNet:      b.config.InstanceFloatingIPNet,
+			FloatingIPNetwork:     b.config.FloatingIPNetwork,
+			FloatingIP:            b.config.FloatingIP,
+			ReuseIPs:              b.config.ReuseIPs,
+			InstanceFloatingIPNet: b.config.InstanceFloatingIPNet,
 		},
 		&communicator.StepConnect{
 			Config: &b.config.RunConfig.Comm,
diff --git a/builder/openstack/networks.go b/builder/openstack/networks.go
index 0635abc86..537d9ce5a 100644
--- a/builder/openstack/networks.go
+++ b/builder/openstack/networks.go
@@ -86,13 +86,12 @@ func GetInstancePortID(client *gophercloud.ServiceClient, id string, instance_fl
 	for i := 0; i < len(interfaces); i++ {
 		log.Printf("Instance interface: %v: %+v\n", i, interfaces[i])
 		if interfaces[i].NetID == instance_float_net {
-			   log.Printf("Found preferred interface: %v\n", i)
-				 selected_interface = i
-				 log.Printf("Using interface value: %v", selected_interface)
+			log.Printf("Found preferred interface: %v\n", i)
+			selected_interface = i
+			log.Printf("Using interface value: %v", selected_interface)
 		}
 	}
 
-
 	return interfaces[selected_interface].PortID, nil
 }
 
diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index a41382edb..0400d2384 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -17,24 +17,24 @@ type RunConfig struct {
 	SSHInterface string              `mapstructure:"ssh_interface"`
 	SSHIPVersion string              `mapstructure:"ssh_ip_version"`
 
-	SourceImage        string            `mapstructure:"source_image"`
-	SourceImageName    string            `mapstructure:"source_image_name"`
-	SourceImageFilters ImageFilter       `mapstructure:"source_image_filter"`
-	Flavor             string            `mapstructure:"flavor"`
-	AvailabilityZone   string            `mapstructure:"availability_zone"`
-	RackconnectWait    bool              `mapstructure:"rackconnect_wait"`
-	FloatingIPNetwork  string            `mapstructure:"floating_ip_network"`
-	FloatingIP         string            `mapstructure:"floating_ip"`
-	ReuseIPs           bool              `mapstructure:"reuse_ips"`
-	SecurityGroups     []string          `mapstructure:"security_groups"`
-	Networks           []string          `mapstructure:"networks"`
-	InstanceFloatingIPNet       string            `mapstructure:"instance_floating_ip_net"`
-	Ports              []string          `mapstructure:"ports"`
-	UserData           string            `mapstructure:"user_data"`
-	UserDataFile       string            `mapstructure:"user_data_file"`
-	InstanceName       string            `mapstructure:"instance_name"`
-	InstanceMetadata   map[string]string `mapstructure:"instance_metadata"`
-	ForceDelete        bool              `mapstructure:"force_delete"`
+	SourceImage           string            `mapstructure:"source_image"`
+	SourceImageName       string            `mapstructure:"source_image_name"`
+	SourceImageFilters    ImageFilter       `mapstructure:"source_image_filter"`
+	Flavor                string            `mapstructure:"flavor"`
+	AvailabilityZone      string            `mapstructure:"availability_zone"`
+	RackconnectWait       bool              `mapstructure:"rackconnect_wait"`
+	FloatingIPNetwork     string            `mapstructure:"floating_ip_network"`
+	FloatingIP            string            `mapstructure:"floating_ip"`
+	ReuseIPs              bool              `mapstructure:"reuse_ips"`
+	SecurityGroups        []string          `mapstructure:"security_groups"`
+	Networks              []string          `mapstructure:"networks"`
+	InstanceFloatingIPNet string            `mapstructure:"instance_floating_ip_net"`
+	Ports                 []string          `mapstructure:"ports"`
+	UserData              string            `mapstructure:"user_data"`
+	UserDataFile          string            `mapstructure:"user_data_file"`
+	InstanceName          string            `mapstructure:"instance_name"`
+	InstanceMetadata      map[string]string `mapstructure:"instance_metadata"`
+	ForceDelete           bool              `mapstructure:"force_delete"`
 
 	ConfigDrive bool `mapstructure:"config_drive"`
 
diff --git a/builder/openstack/step_allocate_ip.go b/builder/openstack/step_allocate_ip.go
index 2043cb75c..8b0701491 100644
--- a/builder/openstack/step_allocate_ip.go
+++ b/builder/openstack/step_allocate_ip.go
@@ -11,10 +11,10 @@ import (
 )
 
 type StepAllocateIp struct {
-	FloatingIPNetwork string
-	FloatingIP        string
-	ReuseIPs          bool
-	InstanceFloatingIPNet			string
+	FloatingIPNetwork     string
+	FloatingIP            string
+	ReuseIPs              bool
+	InstanceFloatingIPNet string
 }
 
 func (s *StepAllocateIp) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {