vagrant-yarrs-and-yamls 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4827f2adbb6b62564cc348077b3a13ebf28869ac
-  data.tar.gz: 34e8bdb21d75adb2716367b092af997d7a671498
+  metadata.gz: 56a27e5be2a3fa276fbbba42596bc74910a255d1
+  data.tar.gz: 03a97984e2db9b80671251f83032fa80d84a7169
 SHA512:
-  metadata.gz: 6c17c77066f4901386f5bb3b39f1d829c69ec127e5f8212fcdc4f8bd4813ad574999ee68c9003c2cf11d4428c4c2962429a61864a0c3fe1bca7458db275da5e7
-  data.tar.gz: 80c5b021abe7dc77b380e75d03d590ceb1232acfb44d285f568caa1ce2181e571139e4643ffe43dce0b177ec159999cf7f4c4047404520df53d98c47a552fbb0
+  metadata.gz: 6cbb96839b6d8806d72b45bb17561efade3da338acab1dfa94feda919e17a41dd0ed218c7dfdb5fdd981f18f2d55ca0bdbcd79f6910a2a8b8d3d9a03edcfe8b3
+  data.tar.gz: d9177a80fcb033fc8505b3b40030eee01ff4af82d6c12fc914c6dfc16bf5e9fe3c8b745b1708806d8361a6e86f77274ce14bbdd5e5c2139202d798c94625acbc

data/lib/vagrant-yarrs-and-yamls/api.rb

@@ -20,6 +20,9 @@ def yarrs(yamlfile, vagrant_config)
     # format nodes into instances
     instances = prepare(config)
 
+    # DEBUG:
+    # puts "instances", instances
+
     # loop through each instance and apply settings
     instances.each do |hostname, settings|
 
@@ -45,10 +48,9 @@ end
 def apply_vagrant_hostupdater(node, settings)
   if defined? VagrantPlugins::HostsUpdater && settings["hostname"] && settings["ip"]
     sites = get_config_part('sites', settings)
-    puts "yarrs-and-yamls: updating your host file with: #{sites}"
     node.hostsupdater.aliases = sites
   else
-    puts "yarrs-and-yamls: vagrant-hostsupdater not installed. Please update your /etc/hosts file for: #{settings}"
+    puts "yarrs-and-yamls: ERROR - vagrant-hostsupdater not installed. Please update your /etc/hosts file for: #{settings}"
   end
 end
 
@@ -169,7 +171,7 @@ def apply_aws_provider(node, settings)
     aws.instance_type = settings["aws"]["instance_type"] if settings["aws"]["instance_type"]
     aws.keypair_name = settings["aws"]["keypair_name"] if settings["aws"]["keypair_name"]
     override.ssh.username = settings["aws"]["username"] if settings["aws"]["username"]
-    override.ssh.private_key_path = settings["aws"]["private_key_path"] if settings["aws"]["private_key_path"]
+    override.ssh.private_key_path = settings["aws"]["private_key_path"] || ENV["AWS_PRIVATE_KEY_PATH"]
 
     # Alternative approach: add keys into your .bashrc or .zshrc profile
     # export AWS_SECRET_KEY=secret_key
@@ -199,15 +201,19 @@ end
 def apply_digitalocean_providier(node, settings)
   return unless settings["digital_ocean"]
 
+  # DEBUG:
+  # puts "digital_ocean", settings["digital_ocean"]
+
   node.vm.provider :digital_ocean do |digital_ocean, override|
     override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
 
     digital_ocean.token = settings["digital_ocean"].include?("token") ? settings["digital_ocean"]["token"] : ENV["DIGITAL_OCEAN_TOKEN"]
 
-    # Optional
-    override.ssh.private_key_path = settings["digital_ocean"]["private_key_path"]
+    override.ssh.private_key_path = settings["digital_ocean"]["private_key_path"] || ENV["DIGITAL_OCEAN_PRIVATE_KEY_PATH"]
     override.ssh.username = settings["digital_ocean"]["username"] if settings["digital_ocean"]["username"]
     digital_ocean.ssh_key_name = settings["digital_ocean"].include?("ssh_key_name") ? settings["digital_ocean"]["ssh_key_name"] : 'Vagrant'
+
+    # Optional
     digital_ocean.image = settings["digital_ocean"].include?("image") ? settings["digital_ocean"]["image"] : "ubuntu-14-04-x64"
     digital_ocean.region = settings["digital_ocean"].include?("region") ? settings["digital_ocean"]["region"] : "nyc2"
     digital_ocean.size = settings["digital_ocean"].include?("size") ? settings["digital_ocean"]["size"] : "512mb"
@@ -228,6 +234,10 @@ def get_config_from_file(configfile)
   localfile  = File.expand_path(configfile.dup)
   localfile  = localfile.insert(configfile.index('.yaml'), '.local')
 
+  # DEBUG:
+  # puts "configfile", configfile
+  # puts "localfile", localfile
+
   if File.exists? localfile
       config = YAML.load_file(localfile)
   elsif File.exists? configfile

data/lib/vagrant-yarrs-and-yamls/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module YarrsAndYamls
-        VERSION = '1.0.4'
+        VERSION = '1.0.5'
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yarrs-and-yamls
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Pirate Dunbar