File tree Expand file tree Collapse file tree 1 file changed +19
-10
lines changed Expand file tree Collapse file tree 1 file changed +19
-10
lines changed Original file line number Diff line number Diff line change @@ -3,11 +3,11 @@ package main
33import (
44 "context"
55 "fmt"
6+ ioutil "io/ioutil"
67 "net"
78 "os"
89 "strings"
910 "time"
10- ioutil "io/ioutil"
1111
1212 "github.com/docker/machine/libmachine/drivers"
1313 "github.com/docker/machine/libmachine/log"
@@ -535,19 +535,14 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
535535 return nil , err
536536 }
537537
538- UserData := d .userData
539-
540- if d .userDataFromFile == true {
541- readUserData , err := ioutil .ReadFile (d .userData )
542- if err != nil {
543- return nil , err
544- }
545- UserData = string (readUserData )
538+ userData , err := d .getUserData ()
539+ if err != nil {
540+ return nil , err
546541 }
547542
548543 srvopts := hcloud.ServerCreateOpts {
549544 Name : d .GetMachineName (),
550- UserData : UserData ,
545+ UserData : userData ,
551546 Labels : d .ServerLabels ,
552547 PlacementGroup : pgrp ,
553548 }
@@ -592,6 +587,20 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
592587 return & srvopts , nil
593588}
594589
590+ func (d * Driver ) getUserData () (string , error ) {
591+ userData := d .userData
592+
593+ if ! d .userDataFromFile {
594+ return userData , nil
595+ }
596+
597+ readUserData , err := ioutil .ReadFile (d .userData )
598+ if err != nil {
599+ return "" , err
600+ }
601+ return string (readUserData ), nil
602+ }
603+
595604func (d * Driver ) setPublicNetIfRequired (srvopts * hcloud.ServerCreateOpts ) error {
596605 pip4 , err := d .getPrimaryIPv4 ()
597606 if err != nil {
You can’t perform that action at this time.
0 commit comments