vagrant-flow 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80519287c51d5fecfce4b0fb0064976b0930a57d
-  data.tar.gz: dffb854411e5df8b0be42380923ca13c66c2d2ce
+  metadata.gz: 7b20ef24ebbdf159fc7d1e1569a191935b45ae5e
+  data.tar.gz: e540c87586b2984b4ea63f58fd21e7c13e27172a
 SHA512:
-  metadata.gz: 67ba5d4c35627c6bf3c8a9ff393eaccd661fa6943345dc64635d5b9374ff7fa77a235f38e342745e96f9dcffad8db0556dc783a71465308213f6d9d64ccbc5b2
-  data.tar.gz: c2e838fe6ec032f545eb7f68cf2120d465dcb2bea0cfa6cec253a86a4ad1168c8b1df266c8e8e75c8b5e3b999eeb34abfe0b3cec0cebc7a3cf0c749dc569bafe
+  metadata.gz: 9644ad9aa6c184bb2b923dbfd4aa7f6fde14ee860b02e9ea40d461086ef4f7af7e8d73e5aca9a88a68c4ebcc7b5fd894c81f6acd5d36acf9098b96ddad9c7fd7
+  data.tar.gz: ea7b51750ba3ddd471c5cb2c2bc060dd5afa5fe1c711291fa1a5a2eb1391eee6c0a59ea9db95a5f90ba8a888bc552ed08ef5cd6dce687af6445cebc4c9e5e5b5

data/README.md

@@ -125,8 +125,9 @@ Example multiinitconfig.yml file (for use with no optional command line argument
 ---
 :intnetName: neverwinterDP
 machines:
+  #This will use all defaults and create a guest named machine1
 - name: machine1
-  url: demandcube/centos-65_x86_64-VB-4.3.8
+  #Create another machine, but specify which .box to use with virtual box
 - name: server1
   url: demandcube/centos-64_x86_64-VB-4.3.8
 - name: jenkinstestmachine
@@ -137,21 +138,35 @@ machines:
 Example multiinitconfig.yml file for use with virtualbox and digitalocean providers.  All the extra parameters are required to make digitalocean work.
 ```
 ---
-:sshPrivateKeyPath: ~/.ssh/id_rsa #Points to your private key file
-:digitalOceanApiKey: yourkeygoeshere #Get your digitalocen api key and client id from https://cloud.digitalocean.com/api_access
-:digitalOceanClientId: youclientidgoeshere
-:digitalOceanRegion: San Francisco 1 #This corresponds to the region option when creating droplets
+#Where your ssh private key lives (for use with digital ocean)
+#~/.ssh/id_rsa is the default, so you can omit this value if you want
+:sshPrivateKeyPath: ~/.ssh/id_rsa
+
+#These two keys (digitalOceanApiKey and digitalOceanClientId) must be set for digitalocean to work
+#Omit them if you don't want digitalocean as a provider option in your vagrantfile
+:digitalOceanApiKey: 782a1d830f62e57d985eb7b1c938f94f
+:digitalOceanClientId: ae856c82c79398598838f3f93b7a7d5e
+
 :intnetName: neverwinterDP
 machines:
-- name: sparkngin1
-  url: demandcube/centos-65_x86_64-VB-4.3.8
-  digitalOceanImage: CentOS 6.5 x64  #This is the Image name you choose when creating a new droplet
-- name: sparkngin2
-  url: demandcube/centos-65_x86_64-VB-4.3.8
-  digitalOceanImage: CentOS 6.5 x64
-- name: jenkinsdp
-  url: demandcube/centos-65_x86_64-VB-4.3.8
-  digitalOceanImage: CentOS 6.5 x64
+  #Create a box with all defaults set for you
+- name: fulldefaults
+
+  #Use a custom url for your virtual box image
+- name: customvboxurl
+  url: demandcube/centos-64_x86_64-VB-4.3.8
+
+  #Set custom config for digitalocean
+- name: digitaloceancustom
+  digitalOceanRegion: New York 2
+  digitalOceanImage: Debian 7.0 x64
+
+  #Set custom config for vbox and digitaloceanprovider
+- name: digitaloceanvboxcustom
+  url: demandcube/centos-64_x86_64-VB-4.3.8
+  digitalOceanRegion: New York 2
+  digitalOceanImage: Debian 7.0 x64
+
 
 ```
 

data/create_sample_multiinit_input-file_digitalocean.rb

@@ -4,15 +4,20 @@ require 'yaml'
 
 ###This shows how to make a valid configuration file in YAML format for vagrant-flow to consume with the ansible-inventory command
 x = {
+  #~/.ssh/id_rsa is also the default
   :sshPrivateKeyPath =>"~/.ssh/id_rsa",
-  :digitalOceanApiKey => "digitaloceanapikeygoeshere",
-  :digitalOceanClientId => "digitaloceanclientidgoeshere",
-  :digitalOceanRegion => "San Francisco 1",
+  
+  #These two keys must be set for digitalocean to work
+  #Omit them if you don't want digitalocean as a provider option in your vagrantfile
+  :digitalOceanApiKey => "123456789098765432",
+  :digitalOceanClientId => "fytudisughfsdalk",
+  
   :intnetName=>"neverwinterDP",
   "machines" => [
-   {"name"=>"sparkngin1", "url"=>"demandcube/centos-65_x86_64-VB-4.3.8", "digitalOceanImage"=>"CentOS 6.5 x64"},
-   {"name"=>"sparkngin2", "url"=>"demandcube/centos-65_x86_64-VB-4.3.8", "digitalOceanImage"=>"CentOS 6.5 x64"},
-   {"name"=>"jenkinsdp", "url"=>"demandcube/centos-65_x86_64-VB-4.3.8", "digitalOceanImage"=>"CentOS 6.5 x64"},
+   {"name"=>"fulldefaults"},
+   {"name"=>"customvboxurl", "url"=>"demandcube/centos-64_x86_64-VB-4.3.8",},
+   {"name"=> "digitaloceancustom", "digitalOceanRegion" => "New York 2", "digitalOceanImage"=>"Debian 7.0 x64"},
+   {"name"=> "digitaloceanvboxcustom", "url"=>"demandcube/centos-64_x86_64-VB-4.3.8", "digitalOceanRegion" => "New York 2", "digitalOceanImage"=>"Debian 7.0 x64" },
   ]
 }
 

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

@@ -26,6 +26,15 @@ module VagrantPlugins
           options[:provision_ignore_sentinel] = false
           options[:quiet] = false
           
+          
+          #Defaults for machine and configs
+          default_sshPrivateKeyPath ="~/.ssh/id_rsa"
+          machineDefaults = {
+            "url"                => "demandcube/centos-65_x86_64-VB-4.3.8",
+            "digitalOceanImage"  =>"CentOS 6.5 x64",
+            "digitalOceanRegion" => "San Francisco 1"
+          }
+          
           #Default virtualbox__intnet name for private network
           options[:vboxintnet] = "neverwinterDP"
           
@@ -128,6 +137,22 @@ module VagrantPlugins
             machine["ip"] =   ip.to_s
           }
           
+          #Set default ssh private key (used by digitalocean provider option)
+          if not content.has_key?(:sshPrivateKeyPath)
+            content[:sshPrivateKeyPath] = default_sshPrivateKeyPath
+          end
+          
+          
+          content["machines"].each {|machine|
+            #Set defaults for digital ocean provicder if they're not provided in the config
+            machineDefaults.each {|key,val|
+              if not machine.has_key?(key)
+                machine[key] = val
+              end
+            }
+          }
+          
+          
           
           #Put Vagrantfile in pwd
           save_path = Pathname.new("Vagrantfile").expand_path(@env.cwd)

data/lib/vagrant-flow/templates/multiinit.erb

@@ -12,33 +12,35 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
 <% for machine in @machines %>
 
-  config.vm.define :<%= machine["name"]%> do | <%= machine["name"]%> |
+  config.vm.define :<%= machine["name"]%> do | <%= machine["name"]%> |    
+    <% if machine.has_key?("name") and machine.has_key?("url")  %>
     <%= machine["name"]%>.vm.box = "<%= machine["url"]%>"
+    <% end %>
     
     # Create a private network
     <%= machine["name"]%>.vm.network :private_network, ip: "<%= machine["ip"]%>", virtualbox__intnet: "<%= @intnetName %>"
     <%= machine["name"]%>.vm.hostname = "<%= machine["name"]%>"
     
+    <% if machine.has_key?("digitalOceanImage") and machine.has_key?("digitalOceanRegion") and @digitalOceanApiKey and @digitalOceanClientId and @sshPrivateKeyPath %>
     #digitalOcean provider
-    <% if machine.has_key?("digitalOceanImage") and @digitalOceanApiKey and @digitalOceanClientId and @sshPrivateKeyPath and @digitalOceanRegion%>
     <%= machine["name"]%>.vm.synced_folder  ".", "/vagrant", disabled: true
     config.vm.provider :digital_ocean do |provider, override|
       override.ssh.private_key_path = '<%= @sshPrivateKeyPath %>'
       provider.client_id = '<%= @digitalOceanClientId %>'
       provider.api_key = '<%= @digitalOceanApiKey %>'
-      provider.private_networking = 'true'
-      provider.region = '<%= @digitalOceanRegion %>'
+      provider.region = '<%=machine["digitalOceanRegion"] %>'
       provider.image = '<%= machine["digitalOceanImage"] %>'
     end
     <% end %>
     
-    
+    <% if machine.has_key?("name") and machine.has_key?("url")  %>
     #VirtualBox provider
     config.vm.provider :virtualbox do |vb|
       vb.name = "<%= machine["name"]%>"
       # vb.customize ["modifyvm", :id, "--memory", "1024"]
       # vb.customize ["modifyvm", :id, "--cpus", "2"]
     end
+    <% end %>
     
   end
 <% end %>

data/lib/vagrant-flow/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantFlow
-    VERSION = "1.0.14"
+    VERSION = "1.0.15"
   end
 end

metadata

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