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
3
3
import (
4
4
"context"
5
5
"fmt"
6
+ ioutil "io/ioutil"
6
7
"net"
7
8
"os"
8
9
"strings"
9
10
"time"
10
- ioutil "io/ioutil"
11
11
12
12
"github.com/docker/machine/libmachine/drivers"
13
13
"github.com/docker/machine/libmachine/log"
@@ -535,19 +535,14 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
535
535
return nil , err
536
536
}
537
537
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
546
541
}
547
542
548
543
srvopts := hcloud.ServerCreateOpts {
549
544
Name : d .GetMachineName (),
550
- UserData : UserData ,
545
+ UserData : userData ,
551
546
Labels : d .ServerLabels ,
552
547
PlacementGroup : pgrp ,
553
548
}
@@ -592,6 +587,20 @@ func (d *Driver) makeCreateServerOptions() (*hcloud.ServerCreateOpts, error) {
592
587
return & srvopts , nil
593
588
}
594
589
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
+
595
604
func (d * Driver ) setPublicNetIfRequired (srvopts * hcloud.ServerCreateOpts ) error {
596
605
pip4 , err := d .getPrimaryIPv4 ()
597
606
if err != nil {
You can’t perform that action at this time.
0 commit comments