vagrant-flow 1.0.18 → 1.0.19

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b8c6ebc9a12b11772d177513f513ae112682473f
4
- data.tar.gz: b1ac38886ea0e0f1405374c2fd26994efafade28
3
+ metadata.gz: dad0bbfd73f2794bc4e74120594f1f2580dcd4c6
4
+ data.tar.gz: cb21b1de1422202b3a57abe2ca9553f3d2044ab4
5
5
  SHA512:
6
- metadata.gz: 6696c8cccf39abf764fa77b20ac9f8b2b3ed6bbe4796aa26d5c0569d67a24bcf5a57a7a34124cb189215c4f637bd64466977adb58a3beb2b1a0613134b32e122
7
- data.tar.gz: ccecc1ef4be7d76364100f3ba19fca1f4bde20623820037a107e1c03c7228c5adfa156769f1c468d98d613fe98d07930570b3aa80936c26e569ff6448699c4b0
6
+ metadata.gz: 6f7af27a757eac04d532a118ed0dd8b6e18d02d76296f234941a8eaf3fc69a05ccb9c79001b0d5231d56aa837616a4375d116942508a93bb42acac2a74370641
7
+ data.tar.gz: a63b7a3d408b54a37872c0482002900a5c1da0a2fa3b1a39373daabd4de15bbbde77313c1d168c61ee82e49c1f1613bb71b45b0328fc309e7ea5b625d1707626
data/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Vagrant-Flow enables a seamless development to production workflow.
4
4
 
5
- Vagrant-Flow is a vagrant plugin which allows for a separation of ansible playbooks from vagrant, mimicing how development works. It enables the generates ansible inventory files, vagrant templates and inter-machine communication to easily prepare to run ansible playbooks and machine communication.
5
+ Vagrant-Flow is a [vagrant] (http://www.vagrantup.com/) plugin which allows for a separation of ansible playbooks from vagrant, mimicing how development works. It enables the generates ansible inventory files, vagrant templates and inter-machine communication to easily prepare to run ansible playbooks and machine communication.
6
6
 
7
7
  - This is part of [NeverwinterDP the Data Pipeline for Hadoop](https://github.com/DemandCube/NeverwinterDP)
8
8
 
@@ -173,6 +173,15 @@ machines:
173
173
  digitalOceanRegion: New York 2
174
174
  digitalOceanImage: Debian 7.0 x64
175
175
 
176
+ #Set custom config for vbox and digitaloceanprovider and sets amount of RAM
177
+ - name: digitaloceanvboxcustom
178
+ url: demandcube/centos-64_x86_64-VB-4.3.8
179
+ digitalOceanRegion: New York 2
180
+ digitalOceanImage: Debian 7.0 x64
181
+ ram: 2GB
182
+ #Valid options for RAM (This is a digital ocean restriction):
183
+ # 512MB, 1GB, 2GB, 4GB, 8GB, 16GB, 32GB, 48GB, 64GB
184
+ #Default RAM is 512MB
176
185
 
177
186
  ```
178
187
 
@@ -18,6 +18,7 @@ x = {
18
18
  {"name"=>"customvboxurl", "url"=>"demandcube/centos-64_x86_64-VB-4.3.8",},
19
19
  {"name"=> "digitaloceancustom", "digitalOceanRegion" => "New York 2", "digitalOceanImage"=>"Debian 7.0 x64"},
20
20
  {"name"=> "digitaloceanvboxcustom", "url"=>"demandcube/centos-64_x86_64-VB-4.3.8", "digitalOceanRegion" => "New York 2", "digitalOceanImage"=>"Debian 7.0 x64" },
21
+ {"name"=> "digitaloceanvboxcustomwithRam", "url"=>"demandcube/centos-64_x86_64-VB-4.3.8", "digitalOceanRegion" => "New York 2", "digitalOceanImage"=>"Debian 7.0 x64", "ram"=>"2GB" },
21
22
  ]
22
23
  }
23
24
 
@@ -32,9 +32,24 @@ 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" => "San Francisco 1"
35
+ "digitalOceanRegion" => "San Francisco 1",
36
+ "ram" => "512MB",
36
37
  }
37
38
 
39
+ #Valid values for amount of RAM
40
+ allowedRam = ["512MB","1GB","2GB","4GB","8GB","16GB","32GB","48GB","64GB"]
41
+ allowedRamConversion = {
42
+ "512MB"=> "512",
43
+ "1GB" => "1024",
44
+ "2GB" => "2048",
45
+ "4GB" => "4096",
46
+ "8GB" => "8192",
47
+ "16GB" => "16384",
48
+ "32GB" => "32768",
49
+ "48GB" => "49152",
50
+ "64GB" => "65536",
51
+ }
52
+
38
53
  #Default virtualbox__intnet name for private network
39
54
  options[:vboxintnet] = "neverwinterDP"
40
55
 
@@ -150,6 +165,16 @@ module VagrantPlugins
150
165
  machine[key] = val
151
166
  end
152
167
  }
168
+
169
+ #Check if RAM value is valid (Digital Ocean restriction)
170
+ if not allowedRam.include?(machine["ram"])
171
+ STDERR.puts "ram option not valid: "+machine["ram"]+"\nSetting to 512MB"
172
+ machine["ram"]="512MB"
173
+ end
174
+
175
+ #Vagrant requires the amount of RAM to be written in MB, so do the conversion
176
+ machine["vagrantram"]= allowedRamConversion[machine["ram"]]
177
+
153
178
  }
154
179
 
155
180
 
@@ -30,6 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
30
30
  provider.api_key = '<%= @digitalOceanApiKey %>'
31
31
  provider.region = '<%=machine["digitalOceanRegion"] %>'
32
32
  provider.image = '<%= machine["digitalOceanImage"] %>'
33
+ provider.size = '<%= machine["ram"] %>'
33
34
  end
34
35
  <% end %>
35
36
 
@@ -37,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
37
38
  #VirtualBox provider
38
39
  config.vm.provider :virtualbox do |vb|
39
40
  vb.name = "<%= machine["name"]%>"
40
- # vb.customize ["modifyvm", :id, "--memory", "1024"]
41
+ vb.customize ["modifyvm", :id, "--memory", "<%= machine["vagrantram"] %>"]
41
42
  # vb.customize ["modifyvm", :id, "--cpus", "2"]
42
43
  end
43
44
  <% end %>
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module VagrantFlow
3
- VERSION = "1.0.18"
3
+ VERSION = "1.0.19"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-flow
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.18
4
+ version: 1.0.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steve Morin
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
87
87
  version: '0'
88
88
  requirements: []
89
89
  rubyforge_project: vagrant-flow
90
- rubygems_version: 2.0.3
90
+ rubygems_version: 2.0.14
91
91
  signing_key:
92
92
  specification_version: 4
93
93
  summary: Enables Vagrant to Generate Ansible Inventory Files.