vagrant-flow 1.0.23 → 1.0.24
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +6 -3
- data/lib/vagrant-flow/command/multiinit.rb +13 -3
- data/lib/vagrant-flow/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4346253056364e8655450006137ddbe7e60b19a2
|
4
|
+
data.tar.gz: d1f010f872b4776f90b25c1205cd5fb3bd2efbaa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 116700b3e4e39f0e0076fd98aa89fe9d521293df59e2bcbdf5e6e5398f55449626127151a9bbce558d889d315d6b83fcf23196b9f8fa33e75786ec1fb182a57a
|
7
|
+
data.tar.gz: 7cfd0eb12a82a2ae9d9686d64c4b382202d3bffb2ad650fa5e035317859db3b024fd657b5c38f2afff2e26559348d7eba92dd179315ed5a8eb7a44c814d44b92
|
data/README.md
CHANGED
@@ -166,19 +166,22 @@ machines:
|
|
166
166
|
|
167
167
|
#Set custom config for digitalocean
|
168
168
|
- name: digitaloceancustom
|
169
|
-
digitalOceanRegion:
|
169
|
+
digitalOceanRegion: nyc2
|
170
170
|
digitalOceanImage: Debian 7.0 x64
|
171
|
+
#Valid options for digitalOceanRegion:
|
172
|
+
#"nyc1, ams1, sfo1, nyc2, ams2, sgp1, lon1
|
173
|
+
#Default is sfo1
|
171
174
|
|
172
175
|
#Set custom config for vbox and digitaloceanprovider
|
173
176
|
- name: digitaloceanvboxcustom
|
174
177
|
url: demandcube/centos-64_x86_64-VB-4.3.8
|
175
|
-
digitalOceanRegion:
|
178
|
+
digitalOceanRegion: sgp1
|
176
179
|
digitalOceanImage: Debian 7.0 x64
|
177
180
|
|
178
181
|
#Set custom config for vbox and digitaloceanprovider and sets amount of RAM
|
179
182
|
- name: digitaloceanvboxcustom
|
180
183
|
url: demandcube/centos-64_x86_64-VB-4.3.8
|
181
|
-
digitalOceanRegion:
|
184
|
+
digitalOceanRegion: sfo1
|
182
185
|
digitalOceanImage: Debian 7.0 x64
|
183
186
|
ram: 2GB
|
184
187
|
#Valid options for RAM (This is a digital ocean restriction):
|
@@ -32,7 +32,7 @@ module VagrantPlugins
|
|
32
32
|
machineDefaults = {
|
33
33
|
"url" => "demandcube/centos-65_x86_64-VB-4.3.8",
|
34
34
|
"digitalOceanImage" =>"CentOS 6.5 x64",
|
35
|
-
"digitalOceanRegion" => "
|
35
|
+
"digitalOceanRegion" => "sfo1",
|
36
36
|
"ram" => "512MB",
|
37
37
|
}
|
38
38
|
|
@@ -50,6 +50,9 @@ module VagrantPlugins
|
|
50
50
|
"64GB" => "65536",
|
51
51
|
}
|
52
52
|
|
53
|
+
#valid values for digitalOceanRegion
|
54
|
+
allowedDORegions = ["nyc1","ams1","sfo1","nyc2","ams2","sgp1","lon1",]
|
55
|
+
|
53
56
|
#Default virtualbox__intnet name for private network
|
54
57
|
options[:vboxintnet] = "neverwinterDP"
|
55
58
|
|
@@ -100,6 +103,7 @@ module VagrantPlugins
|
|
100
103
|
#Load YAML
|
101
104
|
content = YAML.load_file(options[:vagrant_cloud_config_file])
|
102
105
|
rescue
|
106
|
+
puts $!, $@
|
103
107
|
#Give warning if no file could be found
|
104
108
|
if not options[:quiet]
|
105
109
|
warn "Could not open file: "+options[:vagrant_cloud_config_file].to_s
|
@@ -168,13 +172,19 @@ module VagrantPlugins
|
|
168
172
|
|
169
173
|
#Check if RAM value is valid (Digital Ocean restriction)
|
170
174
|
if not allowedRam.include?(machine["ram"])
|
171
|
-
STDERR.puts "ram option not valid: "+machine["ram"]+"\nSetting to
|
172
|
-
machine["ram"]="
|
175
|
+
STDERR.puts "ram option not valid: "+machine["ram"]+"\nSetting to "+machineDefaults["ram"]
|
176
|
+
machine["ram"]=machineDefaults["ram"]
|
173
177
|
end
|
174
178
|
|
175
179
|
#Vagrant requires the amount of RAM to be written in MB, so do the conversion
|
176
180
|
machine["vagrantram"]= allowedRamConversion[machine["ram"]]
|
177
181
|
|
182
|
+
#Make sure the digitalOceanRegion is correct
|
183
|
+
if not allowedDORegions.include?(machine["digitalOceanRegion"])
|
184
|
+
STDERR.puts "digitalOceanRegion option not valid: "+machine["digitalOceanRegion"]+"\nSetting to "+machineDefaults["digitalOceanRegion"]
|
185
|
+
machine["digitalOceanRegion"]=machineDefaults["digitalOceanRegion"]
|
186
|
+
end
|
187
|
+
|
178
188
|
}
|
179
189
|
|
180
190
|
|
data/lib/vagrant-flow/version.rb
CHANGED