vagrant-yarrs-and-yamls 0.6.0 → 0.7.0

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: a25067043b1d835af5cafe974baa435937ec6f3e
4
- data.tar.gz: 6c7d65f8e6b4e9a72659ea76f25f43826454ce22
3
+ metadata.gz: 7a691ad1f1a92c8c1fbb9ef75ea88a765c67c1c5
4
+ data.tar.gz: c04ba00952460be8566cc4959f975b996c306c29
5
5
  SHA512:
6
- metadata.gz: bfb223ea8ea6a283d857a1fc9f178ab31d8a3d5baa66c6e1a1e2a6ceaea8d84c292f8e2fe1243046d0662429a800a564dc75b62370a316e1774d349c5404f871
7
- data.tar.gz: 271d74e280a96ee576236232b295caabe377f6133e36f3cd396603c93ec73eb90d2bb11357cee18b50b12bd23281e44d59245ec006e8ee6e06358196c3ed8cd8
6
+ metadata.gz: a3db2984c7aea87065bf650b33635aa5b1e76c9baab4b95e9e47e7a5fcd307d8a0cfb0d291b7b1f6b044debfe91fb11d099a29d2ec78aeb98f20db5ddc0abd08
7
+ data.tar.gz: a0ecef8b1b9f280517e1eb31a8a0745a097ffbea8d754b4225b821ace2f69c47c264240dbd59144598852304da6ca61aeb534661e1d721108f2ace8ae7a683f9
@@ -87,11 +87,11 @@ def yarrs_and_yamls(config=nil)
87
87
  override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
88
88
 
89
89
  # Required parameters
90
- aws.ami = box["aws"]["ami"] || 'ami-d05e75b8'
91
- aws.instance_type = box["aws"]["instance_type"] || 't2.micro'
92
- aws.keypair_name = box["aws"]["keypair_name"] || raise("An error occurred. Missing aws 'keypair name'.")
93
- override.ssh.username = box["aws"]["username"] || 'ubuntu'
94
- override.ssh.private_key_path = box["aws"]["private_key_path"]
90
+ aws.ami = box["aws"]["ami"] if box["aws"]["ami"]
91
+ aws.instance_type = box["aws"]["instance_type"] if box["aws"]["instance_type"]
92
+ aws.keypair_name = box["aws"]["keypair_name"] if box["aws"]["keypair_name"]
93
+ override.ssh.username = box["aws"]["username"] if box["aws"]["username"]
94
+ override.ssh.private_key_path = box["aws"]["private_key_path"] if box["aws"]["private_key_path"]
95
95
 
96
96
  # Alternative approach: add keys into your .bashrc or .zshrc profile
97
97
  # export AWS_SECRET_KEY=secret_key
@@ -144,6 +144,8 @@ end
144
144
  def get_nodes(v=nil)
145
145
  boxes = {}
146
146
 
147
+ return boxes if v["boxes"].empty?
148
+
147
149
  v["boxes"].collect do |box|
148
150
  next unless box["hostname"]
149
151
 
@@ -221,9 +223,7 @@ def get_nodes(v=nil)
221
223
  boxes[box["hostname"]]["gui"] = box["gui"] if box["gui"]
222
224
  boxes[box["hostname"]]["disable_vm_optimization"] = box["disable_vm_optimization"] if box.include? "disable_vm_optimization"
223
225
 
224
- boxes[box["hostname"]]["aws"] ||= []
225
226
  boxes[box["hostname"]]["aws"] = box["aws"] if box["aws"]
226
- boxes[box["hostname"]]["digital_ocean"] ||= []
227
227
  boxes[box["hostname"]]["digital_ocean"] = box["digital_ocean"] if box["digital_ocean"]
228
228
  end
229
229
 
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module YarrsAndYamls
3
- VERSION = '0.6.0'
3
+ VERSION = '0.7.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-yarrs-and-yamls
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pirate Dunbar