vagrant-flow 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef223fff1521ae73f73fea4c6e406cc63f9fe93a
-  data.tar.gz: 93d0fa017004c09dc7e6c405e7f1844ce4e28ea2
+  metadata.gz: 4346253056364e8655450006137ddbe7e60b19a2
+  data.tar.gz: d1f010f872b4776f90b25c1205cd5fb3bd2efbaa
 SHA512:
-  metadata.gz: dd6351a07da1bf94646b4b93ae29c4239bae08cd36e103597f20d5644b2366c0b1847673ad8e2449e1b150fbb8464da02e026eed163c58bfc82fcfc806228b82
-  data.tar.gz: 0f6ed2fdb058ef7c3afd57dc0963a1e17b957343322860976d2bf5b74dd6de11606c97d46f61ea8ef7f1a62846220edb4d1565d6f359e966fa9eaab1f29aa7c6
+  metadata.gz: 116700b3e4e39f0e0076fd98aa89fe9d521293df59e2bcbdf5e6e5398f55449626127151a9bbce558d889d315d6b83fcf23196b9f8fa33e75786ec1fb182a57a
+  data.tar.gz: 7cfd0eb12a82a2ae9d9686d64c4b382202d3bffb2ad650fa5e035317859db3b024fd657b5c38f2afff2e26559348d7eba92dd179315ed5a8eb7a44c814d44b92

data/README.md

@@ -166,19 +166,22 @@ machines:
 
   #Set custom config for digitalocean
 - name: digitaloceancustom
-  digitalOceanRegion: New York 2
+  digitalOceanRegion: nyc2
   digitalOceanImage: Debian 7.0 x64
+#Valid options for digitalOceanRegion:
+#"nyc1, ams1, sfo1, nyc2, ams2, sgp1, lon1
+#Default is sfo1
 
   #Set custom config for vbox and digitaloceanprovider
 - name: digitaloceanvboxcustom
   url: demandcube/centos-64_x86_64-VB-4.3.8
-  digitalOceanRegion: New York 2
+  digitalOceanRegion: sgp1
   digitalOceanImage: Debian 7.0 x64
 
   #Set custom config for vbox and digitaloceanprovider and sets amount of RAM
 - name: digitaloceanvboxcustom
   url: demandcube/centos-64_x86_64-VB-4.3.8
-  digitalOceanRegion: New York 2
+  digitalOceanRegion: sfo1
   digitalOceanImage: Debian 7.0 x64
   ram: 2GB
   #Valid options for RAM (This is a digital ocean restriction):

data/lib/vagrant-flow/command/multiinit.rb

@@ -32,7 +32,7 @@ module VagrantPlugins
           machineDefaults = {
             "url"                => "demandcube/centos-65_x86_64-VB-4.3.8",
             "digitalOceanImage"  =>"CentOS 6.5 x64",
-            "digitalOceanRegion" => "San Francisco 1",
+            "digitalOceanRegion" => "sfo1",
             "ram"                => "512MB",
           }
           
@@ -50,6 +50,9 @@ module VagrantPlugins
                                   "64GB" => "65536",
                                   }
           
+          #valid values for digitalOceanRegion
+          allowedDORegions = ["nyc1","ams1","sfo1","nyc2","ams2","sgp1","lon1",]
+          
           #Default virtualbox__intnet name for private network
           options[:vboxintnet] = "neverwinterDP"
           
@@ -100,6 +103,7 @@ module VagrantPlugins
               #Load YAML
               content = YAML.load_file(options[:vagrant_cloud_config_file])
             rescue
+              puts $!, $@
               #Give warning if no file could be found
               if not options[:quiet]
                 warn "Could not open file: "+options[:vagrant_cloud_config_file].to_s
@@ -168,13 +172,19 @@ module VagrantPlugins
             
             #Check if RAM value is valid (Digital Ocean restriction)
             if not allowedRam.include?(machine["ram"])
-              STDERR.puts "ram option not valid: "+machine["ram"]+"\nSetting to 512MB"
-              machine["ram"]="512MB"
+              STDERR.puts "ram option not valid: "+machine["ram"]+"\nSetting to "+machineDefaults["ram"]
+              machine["ram"]=machineDefaults["ram"]
             end
             
             #Vagrant requires the amount of RAM to be written in MB, so do the conversion
             machine["vagrantram"]= allowedRamConversion[machine["ram"]]
             
+            #Make sure the digitalOceanRegion is correct
+            if not allowedDORegions.include?(machine["digitalOceanRegion"])
+              STDERR.puts "digitalOceanRegion option not valid: "+machine["digitalOceanRegion"]+"\nSetting to "+machineDefaults["digitalOceanRegion"]
+              machine["digitalOceanRegion"]=machineDefaults["digitalOceanRegion"]
+            end
+            
           }
           
           

data/lib/vagrant-flow/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantFlow
-    VERSION = "1.0.23"
+    VERSION = "1.0.24"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Steve Morin