vagrant-flow 1.0.19 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad0bbfd73f2794bc4e74120594f1f2580dcd4c6
-  data.tar.gz: cb21b1de1422202b3a57abe2ca9553f3d2044ab4
+  metadata.gz: 00d213603722e753a64dc6d017f1a3411deffef2
+  data.tar.gz: 8b4f6e26f222c8fe0e508ec771889bb33ffabe53
 SHA512:
-  metadata.gz: 6f7af27a757eac04d532a118ed0dd8b6e18d02d76296f234941a8eaf3fc69a05ccb9c79001b0d5231d56aa837616a4375d116942508a93bb42acac2a74370641
-  data.tar.gz: a63b7a3d408b54a37872c0482002900a5c1da0a2fa3b1a39373daabd4de15bbbde77313c1d168c61ee82e49c1f1613bb71b45b0328fc309e7ea5b625d1707626
+  metadata.gz: 8e6232bbd26f61b63b1fc22848ab2e52bc3b8be29404962affee91464075e683ef08f28699c03b07c4af43a05faf01b270a2c41805c7122bb49ae68f14c36998
+  data.tar.gz: 2d552ee70774fee88632a1f177cad5eb811661dd8041339a064a67a71d4095f4c6bd41e6238b2e1b9a1b22ea6935b880705b41494f5aedf69cee8eb24431e35c

data/README.md

@@ -15,6 +15,7 @@ Vagrant-Flow is a [vagrant] (http://www.vagrantup.com/) plugin which allows for
 echo "StrictHostKeyChecking no" >> ~/.ssh/config
 
 #If you're on OSX
+#This step may no longer be necessary as vagrant-digitalocean shouldn't require it anymore
 brew install curl-ca-bundle
 
 
@@ -141,17 +142,18 @@ machines:
 
 ```
 
-Example multiinitconfig.yml file for use with virtualbox and digitalocean providers.  All the extra parameters are required to make digitalocean work.
+Example multiinitconfig.yml file for use with virtualbox and digitalocean providers.  All the extra parameters are required to make digitalocean work.  Get your digitalOcean token by logging in and generating a new token under "Apps & API"
 ```
 ---
 #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
+
+#The digitalOceanToken must be set for digitalocean to work.  You can generate one at https://cloud.digitalocean.com/settings/applications
+#Omit it if you don't want digitalocean as a provider option in your vagrantfile
+:digitalOceanToken: xxxxxxxxxxxxxxyyyyyyyzzzzz988765445678765
+
 
 :intnetName: neverwinterDP
 machines:

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

@@ -1,41 +1,60 @@
 require "net/http"
 require "uri"
 require "json"
-require "uri"
 
 class DigitalOcean_Api
   
-  def initialize(digitaloceanurl= 'https://api.digitalocean.com/droplets/?')
+  def initialize(digitaloceanurl= 'https://api.digitalocean.com', digitaloceanpath="/v2/droplets")
       @DIGITALOCEAN_URL=digitaloceanurl
+      @DIGITALOCEAN_PATH=digitaloceanpath
   end
   
-  #getparams should be a hash that will get turned into a url
-  def makeApiCall(getparams)
-    url = @DIGITALOCEAN_URL + URI.encode_www_form(getparams)
-    
-    response = Net::HTTP.get_response(URI.parse(url))
-    
+  #params should be a hash that will be in the form of
+  #{"Authorization"=>"Bearer ~~DIGITALOCEANTOKEN~~"}
+  def makeApiCall(params)
+
+    uri = URI.parse(@DIGITALOCEAN_URL)
+    http = Net::HTTP.new(uri.host,uri.port)
+    http.use_ssl = true
+    request = Net::HTTP::Get.new(@DIGITALOCEAN_PATH)
+
+    request.initialize_http_header(params)
+    response = http.request(request)
     return JSON.parse(response.body)
   end
   
-  #https://api.digitalocean.com/droplets/?client_id=xxxxxxx&api_key=yyyyyyyyyy
+  
   #returns parsed hash object from returned json
-  def showAllActiveDroplets(clientId,apiKey)
+  def showAllActiveDroplets(token)
     x = {
-      "client_id" => clientId,
-      "api_key"   => apiKey,
+      "Authorization" => "Bearer "+token
     }
     return makeApiCall(x)
   end
   
   #Calls showAllActiveDroplets and then parses the info for just hostname and ip
-  def getHostNamesAndIps(clientId,apiKey)
-    hash = showAllActiveDroplets(clientId,apiKey)
+  def getHostNamesAndIps(token)
+    hash = showAllActiveDroplets(token)
     returnHash = []
+    
     hash["droplets"].each {|droplet|
+        #Grab the IP information for each droplet
+        #Each IP is contained in an array, so extract that
+        ip = []
+        droplet["networks"]["v4"].each do |x|
+          ip.push(x["ip_address"])
+        end
+        
+        #Usually there's only the one IP address per machine,
+        #this will help with backwards compatibility
+        if ip.length == 1
+          ip = ip[0]
+        end
+        
+        
         returnHash.push({
                           :hostname => droplet["name"],
-                          :ip       => droplet["ip_address"]
+                          :ip       => ip
                           })
       }
     return returnHash

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

@@ -30,7 +30,7 @@ module VagrantPlugins
           options[:nowrite] = false
           options[:quiet] = false
           options[:digitalocean] = false
-          options[:digitalocean_file] = "hostfile_do.yml"
+          options[:digitalocean_file] = "multiinitconfig.yml"
 
           #Parse option, look up OptionParser documentation
           opts = OptionParser.new do |o|
@@ -48,11 +48,11 @@ module VagrantPlugins
               options[:nowrite] = true
             end
             
-            o.on("-d", "--digitalocean", "(Optional) Writes your digital ocean's hostnames and IP addresses to hosts file.  Default file is hostfile_do.yml") do |f|
+            o.on("-d", "--digitalocean", "(Optional) Writes your digital ocean's hostnames and IP addresses to the host files of your machines.  Default file is multiinitconfig.yml") do |f|
               options[:digitalocean] = true
             end
             
-            o.on("-o", "--digitaloceanfile FILE", "(Optional) File to read in for -d option instead of hostfile_do.yml") do |f|
+            o.on("-o", "--digitaloceanfile FILE", "(Optional) File to read in for -d option instead of multiinitconfig.yml") do |f|
               options[:digitalocean_file] = f
             end
           end
@@ -67,7 +67,7 @@ module VagrantPlugins
           if options[:digitalocean]
             config = YAML.load_file(options[:digitalocean_file])
             digitalocean = DigitalOcean_Api.new()
-            hostinfo = digitalocean.getHostNamesAndIps(config[:client_id],config[:api_key])
+            hostinfo = digitalocean.getHostNamesAndIps(config[:digitalOceanToken])
           else
             with_target_vms(argv, :provider => options[:provider]) do |machine|
               return unless machine.communicate.ready?

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

@@ -8,7 +8,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   
   Vagrant.require_version ">= 1.4.3"
 
-  
+  <% if @sshPrivateKeyPath %>
+  config.ssh.private_key_path = '<%= @sshPrivateKeyPath %>'
+  <% end %>
 
 <% for machine in @machines %>
 
@@ -21,22 +23,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     <%= 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
     <%= 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 %>'
+    
+    <% if machine.has_key?("digitalOceanImage") and machine.has_key?("digitalOceanRegion") and @digitalOceanToken and @sshPrivateKeyPath %>
+    #digitalOcean provider
+    <%= machine["name"]%>.vm.provider :digital_ocean do |provider, override|  
+      provider.token  = '<%= @digitalOceanToken %>'
       provider.region = '<%=machine["digitalOceanRegion"] %>'
-      provider.image = '<%= machine["digitalOceanImage"] %>'
-      provider.size = '<%= machine["ram"] %>'
+      provider.image  = '<%= machine["digitalOceanImage"] %>'
+      provider.size   = '<%= machine["ram"] %>'
     end
     <% end %>
     
     <% if machine.has_key?("name") and machine.has_key?("url")  %>
     #VirtualBox provider
-    config.vm.provider :virtualbox do |vb|
+    <%= machine["name"]%>.vm.provider :virtualbox do |vb|
       vb.name = "<%= machine["name"]%>"
       vb.customize ["modifyvm", :id, "--memory", "<%= machine["vagrantram"] %>"]
       # vb.customize ["modifyvm", :id, "--cpus", "2"]

data/lib/vagrant-flow/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantFlow
-    VERSION = "1.0.19"
+    VERSION = "1.0.21"
   end
 end

metadata

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