bug fix

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.2 (2016-06-07)
+
+Bug fix
+
 ## 1.0.1 (2016-06-02)
 
 Added SWAP

README.md

@@ -11,7 +11,7 @@ To install this plugin manually, download the binary `docker-machine-driver-vsca
 and  make it available by `$PATH`, for example by putting it to `/usr/local/bin/`:
 
 ```console
-$ curl -L https://github.com/vahaah/docker-machine-driver-vscale/releases/download/1.0.1/docker-machine-driver-vscale > /usr/local/bin/docker-machine-driver-vscale
+$ curl -L https://github.com/vahaah/docker-machine-driver-vscale/releases/download/1.0.2/docker-machine-driver-vscale > /usr/local/bin/docker-machine-driver-vscale
 
 $ chmod +x /usr/local/bin/docker-machine-driver-vscale
 ```

version.go

@@ -6,7 +6,7 @@ import "fmt"
 var GitCommit string
 
 // Version number that is being run at the moment.
-const Version = "1.0.1"
+const Version = "1.0.2"
 
 // FullVersion formats the version to be printed.
 func FullVersion() string {

vscale.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net"
 	"time"
+	"reflect"
 	"io/ioutil"
 
 	"github.com/docker/machine/libmachine/drivers"
@@ -27,7 +28,7 @@ type Driver struct {
 }
 
 const (
-	defaultRplan    = "small"
+	defaultRplan = "small"
 	defaultLocation = "spb0"
 	defaultMadeFrom = "ubuntu_14.04_64_002_master"
 	defaultSwapFile = 0
@@ -190,18 +191,30 @@ func (d *Driver) Create() error {
 		time.Sleep(1 * time.Second)
 	}
 
-	log.Info(fmt.Sprintf("Created scalet with ID: %v, IPAddress: %v", d.ScaletID, d.IPAddress))
+	log.Info(fmt.Sprintf("Creating scalet with ID: %v, IPAddress: %v", d.ScaletID, d.IPAddress))
 	if d.SwapFile > 0 {
-		log.Info(fmt.Sprintf("Creating SWAP file %d MB", d.SwapFile))
-
-		_, err := drivers.RunSSHCommandFromDriver(d, fmt.Sprintf(`touch /var/swap.img && \
-		chmod 600 /var/swap.img && \
-		dd if=/dev/zero of=/var/swap.img bs=1MB count=%d && \
-		mkswap /var/swap.img && swapon /var/swap.img && \
-		echo '/var/swap.img    none    swap    sw    0    0' >> /etc/fstab`, d.SwapFile))
-
-		if err != nil {
-			return err
+		for {
+			tasks, _, err := client.Scalet.Tasks()
+
+			if reflect.DeepEqual(tasks, &[]api.ScaletTask{}) {
+				log.Info(fmt.Sprintf("Creating SWAP file %d MB", d.SwapFile))
+				_, err := drivers.RunSSHCommandFromDriver(d, fmt.Sprintf(`touch /var/swap.img && \
+					chmod 600 /var/swap.img && \
+					dd if=/dev/zero of=/var/swap.img bs=1MB count=%d && \
+					mkswap /var/swap.img && swapon /var/swap.img && \
+					echo '/var/swap.img    none    swap    sw    0    0' >> /etc/fstab`, d.SwapFile))
+
+				if err != nil {
+					return err
+				}
+				break
+			}
+
+			if err != nil {
+				return err
+			}
+
+			time.Sleep(1 * time.Second)
 		}
 	}
 	return nil