vagrant-flow 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54685dd37ecf95df8cc76ba9bbc9775968ee79ab
-  data.tar.gz: 83543d3bb7ad5cb6e808fa4ec5c7dc4dabe1221d
+  metadata.gz: 1d3ded31cb6dedca2fa9b995903b2efb9fbef217
+  data.tar.gz: 4877689ebcecd0ecf990a3245fbfe46518c4d040
 SHA512:
-  metadata.gz: 88f9c126ecbaf8accff7ec354c8873a5b148eab4e85ed73445f8f1d5167d0bae29ab3f8384600b9a8c431dd9c9731c2584e8ab14f96007fba65900f10ba6a917
-  data.tar.gz: c0607b27246e8ad08dc8aec8abda3aa9dce4e7a7d9401f97fc144b1cd31ac5fcce799cc79f684c05fffbea3d6a70ffaf33263e15fbd6b56997579bf5853286b9
+  metadata.gz: 7e64d23a40b362c4497bbbacbcd4bba7771cdb86385075d9c2ab8dba59b3b6d4b14373311cc15198f89353bb35d2527cc9c1a8bca836e94cf22f0a218bc1da64
+  data.tar.gz: 7edfa6e7af03f6ec087d2cfa3643ab5d7a46cf7c4180a96dc16f79f094c5f8518c99a05ab3bcb81907af2f22aa05caba4a0262647fca359815e080205f6eb956

data/README.md

@@ -1,29 +1,76 @@
 # Vagrant-Flow
 
-Vagrant Plugin allows for a better ansible flow. It generates ansible inventory files to easily prepare to run ansible playbooks
+Vagrant-Flow enables a seamless development to production workflow.
 
+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.
 
-## Installation
+- This is part of [NeverwinterDP the Data Pipeline for Hadoop](https://github.com/DemandCube/NeverwinterDP)
 
-`vagrant plugin install vagrant-flow`
 
+## Installation
 
-Below is how to install as a regular gem which won't work
+```
+#This is so 'vagrant flow hostfile' can automatically connect to digital ocean machines
+#Otherwise it will hang when dealing with remote hosts
+echo "StrictHostKeyChecking no" >> ~/.ssh/config
 
-Add this line to your application's Gemfile:
+#If you're on OSX
+brew install curl-ca-bundle
 
-    gem 'vagrant-flow'
 
-And then execute:
+vagrant plugin install vagrant-digitalocean
+vagrant plugin install vagrant-flow
+```
 
-    $ bundle
+## Contributing
 
-Or install it yourself as:
+See the [NeverwinterDP Guide to Contributing] (https://github.com/DemandCube/NeverwinterDP#how-to-contribute)
 
-    $ gem install vagrant-flow
 
 * * *
 
+## Usage and Specs
+vagrant-flow has 1 command `flow` and the following subcommands:
+
+```
+multiinit
+hostfile
+ansibleinventory
+playbook
+```
+
+- multiinit
+  - Creates a template Vagrantfile based on the machines you specify
+- hostfile
+  - Creates a hostfile and copies it to each VM so that machine can talk to each other
+- ansibleinventory
+  - Create a ansible machine inventory file so that you can use ansible to provision the machines
+- playbook
+  - Uses a confile to run ansible-play book to provision one or more VM's
+
+Example flow to be enabled
+```
+vagrant plugin install vagrant-flow
+git clone http://github.com/DemandCube/DeveloperPlaybooks
+mkdir devsetup
+cd devsetup
+vagrant flow multiinit -l boxname1:demandcube/centos-65_x86_64-VB-4.3.8,boxname2:demandcube/centos-65_x86_65-VB-4.3.8
+vagrant up
+vagrant flow hostfile
+vagrant flow ansibleinventory
+
+# Then
+
+vagrant flow playbook
+# or
+ansible-playbook -i ansible-flow_inventoryfile ../DeveloperPlaybooks/site.yml
+
+#communication test
+vagrant ssh boxname1 ping boxname2
+vagrant ssh boxname2 ping boxname1
+```
+
+
 # Usage
 
 
@@ -229,7 +276,46 @@ servergroup
 ```
 
 * * *
+##playbook
+```
+Usage: vagrant flow playbook [-hpf]
+Reads in config from flow-playbook.yml by default to be able to run ansible-playbook more easily
 
+    -f, --file-playbook FILE         (Optional) Use a specified playbook config file instead of default (flow-playbook.yml)
+    -p, --print-only                 (Optional) Don't actually ansible-playbook, but just output what would be run to STDOUT
+    -q, --quiet                      (Optional) Suppress output to STDOUT and STDERR
+    -h, --help                       Print this help
+```
+
+This will run ansible-playbook based on the config in flow-playbook.yml
+```
+vagrant flow playbook
+```
+
+This will run ansible-playbook based on the config in myOwnConfig.yml
+```
+vagrant flow playbook -f myOwnConfig.yml
+```
+
+This will not actually run ansible-playbook, but will only output the command it would run to STDOUT
+```
+vagrant flow playbook -p
+```
+The output from the above command using -p will look like this:
+```
+ansible-playbook -i vagrant-flow_ansible_inventory myPlaybooks/main.yml
+```
+
+###Expectations:
+Example flow-playbook.yml file
+```
+---
+:playbook: defaultplaybook.yml             #Required
+:inventory: vagrant-flow_ansible_inventory #Required
+:pattern: '*'                              #Optional.  Will be used in conjunction like so 'ansible-playbook -l [pattern] -i [inventory] -p [playbook]'
+```
+
+* * *
 
 ## Future Usage and Specs
 Looking for vagrant-flow to have the following commands:
@@ -262,13 +348,7 @@ vagrant ssh frontend1 ping frontend2
 vagrant ssh frontend2 ping frontend1
 ```
 
-## Contributing
 
-1. Fork it ( http://github.com/DemandCube/vagrant-flow/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
 
 
 ## Development Flow
@@ -314,6 +394,22 @@ Creating a Gem
 * Tutorial <>
 * <http://railscasts.com/episodes/245-new-gem-with-bundler>
 
+Below is how to install as a regular gem which won't work
+
+Add this line to your application's Gemfile:
+
+    gem 'vagrant-flow'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install vagrant-flow
+
+* * *
+
 Commands 
 
 ```

data/VAGRANT-FLOW

@@ -0,0 +1,23 @@
+ __      __     _____ _____            _   _ _______     ______ _      ______          __
+ \ \    / /\   / ____|  __ \     /\   | \ | |__   __|   |  ____| |    / __ \ \        / /
+  \ \  / /  \ | |  __| |__) |   /  \  |  \| |  | |______| |__  | |   | |  | \ \  /\  / / 
+   \ \/ / /\ \| | |_ |  _  /   / /\ \ | . ` |  | |______|  __| | |   | |  | |\ \/  \/ /  
+    \  / ____ \ |__| | | \ \  / ____ \| |\  |  | |      | |    | |___| |__| | \  /\  /   
+     \/_/    \_\_____|_|  \_\/_/    \_\_| \_|  |_|      |_|    |______\____/   \/  \/    
+     /\                                                                                  
+    /  \                                                                                 
+   / /\ \                                                                                
+  / ____ \                                                                               
+ /_/___ \_\                             _  _____      _                                  
+ |  __ \                               | |/ ____|    | |                                 
+ | |  | | ___ _ __ ___   __ _ _ __   __| | |    _   _| |__   ___                         
+ | |  | |/ _ \ '_ ` _ \ / _` | '_ \ / _` | |   | | | | '_ \ / _ \                        
+ | |__| |  __/ | | | | | (_| | | | | (_| | |___| |_| | |_) |  __/                        
+ |_____/ \___|_| |_| |_|\__,_|_| |_|\__,_|\_____\__,_|_.__/ \___|                        
+ |  __ \         (_)         | |                                                         
+ | |__) | __ ___  _  ___  ___| |_                                                        
+ |  ___/ '__/ _ \| |/ _ \/ __| __|                                                       
+ | |   | | | (_) | |  __/ (__| |_                                                        
+ |_|   |_|  \___/| |\___|\___|\__|                                                       
+                _/ |                                                                     
+               |__/                                                                      

data/create_sample_hostfile_digitalocean_input-file.rb

@@ -0,0 +1,25 @@
+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 = {
+  :api_key => "apikeygoeshere",
+  :client_id => "clientidgoeshere",
+}
+
+begin
+  File.open('hostfile_do.yml', 'w') {|f| f.write x.to_yaml }
+rescue
+  warn "Could not write file hostfile_do.yml"
+end
+
+y = YAML.load(x.to_yaml)
+
+y.each {|key,value|
+  puts key
+  puts value
+  puts "\n"
+}
+

data/create_sample_multiinit_input-file_digitalocean.rb

@@ -0,0 +1,34 @@
+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 = {
+  :sshPrivateKeyPath =>"~/.ssh/id_rsa",
+  :digitalOceanApiKey => "digitaloceanapikeygoeshere",
+  :digitalOceanClientId => "digitaloceanclientidgoeshere",
+  :digitalOceanRegion => "San Francisco 1",
+  :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"},
+  ]
+}
+
+begin
+  File.open('multiinitconfig.yml', 'w') {|f|
+    f.write x.to_yaml
+  }
+rescue
+  warn "Could not write file multiinit.yml"
+end
+
+
+y = YAML.load(x.to_yaml)
+
+y.each {|key,value|
+  puts key
+  puts value
+  puts "\n"
+}

data/create_sample_playbook_input-file.rb

@@ -0,0 +1,27 @@
+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 = {
+  :playbook => "defaultplaybook.yml",
+  :inventory => "vagrant-flow_ansible_inventory",
+  #:pattern => "*",  #:pattern is optional
+}
+
+begin
+  File.open('flow-playbook.yml', 'w') {|f|
+    f.write x.to_yaml
+  }
+rescue
+  warn "Could not write file flow-playbook.yml"
+end
+
+
+y = YAML.load(x.to_yaml)
+
+y.each {|key,value|
+  puts key
+  puts value
+  puts "\n"
+}

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

@@ -0,0 +1,51 @@
+require "net/http"
+require "uri"
+require "json"
+
+class DigitalOcean_Api
+  
+  def initialize(digitaloceanurl= 'https://api.digitalocean.com/droplets/?')
+      @DIGITALOCEAN_URL=digitaloceanurl
+  end
+  
+  #getparams should be a hash that will get turned into a url
+  def makeApiCall(getparams)
+    url = @DIGITALOCEAN_URL
+    getparams.each {|key,val|
+      url+=key+"="+val+"&"
+    }
+    url = url.chomp("&")
+    
+    response = Net::HTTP.get_response(URI.parse(url))
+    
+    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)
+    x = {
+      "client_id" => clientId,
+      "api_key"   => apiKey,
+    }
+    return makeApiCall(x)
+  end
+  
+  #Calls showAllActiveDroplets and then parses the info for just hostname and ip
+  def getHostNamesAndIps(clientId,apiKey)
+    hash = showAllActiveDroplets(clientId,apiKey)
+    returnHash = []
+    hash["droplets"].each {|droplet|
+        returnHash.push({
+                          :hostname => droplet["name"],
+                          :ip       => droplet["ip_address"]
+                          })
+      }
+    return returnHash
+  end
+  
+end
+
+
+
+

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

@@ -1,19 +1,25 @@
 require "vagrant"
 require 'optparse'
 require 'tempfile'
+require 'yaml'
+
+#Require my library for talking to digitalocean
+require File.expand_path(File.dirname(__FILE__) ) +"/digitalocean_api"
 
 module VagrantPlugins
   module CommandVagrantFlow
     module Command
       class HostFile < Vagrant.plugin("2", :command)
-        
+        @@begin_tag_line = "##BEGIN: ADDED BY NEVERWINTERDP'S VAGRANT-FLOW HOSTFILE COMMAND"
+        @@end_tag_line = "##END: ADDED BY NEVERWINTERDP'S VAGRANT-FLOW HOSTFILE COMMAND"
+
         # Builtin from Command class
         # Must override to provide a description
         def self.synopsis
           "Sets /etc/hosts so that all your machines can communicate with each other"
         end
-        
-        
+
+
         # Builtin from Command class
         # Must override to provide core functionality
         def execute
@@ -23,60 +29,86 @@ module VagrantPlugins
           options[:provision_ignore_sentinel] = false
           options[:nowrite] = false
           options[:quiet] = false
-          
-          #Parse option, look up OptionParser documentation 
+          options[:digitalocean] = false
+          options[:digitalocean_file] = "hostfile_do.yml"
+
+          #Parse option, look up OptionParser documentation
           opts = OptionParser.new do |o|
             # o.banner = "Usage: vagrant ansible-inventory [vm-name] [options] [-h]"
             o.banner = "A NeverWinterDP technology from the Department of Badass.\n\n"+
                         "Usage: vagrant flow hostfile [-hnkq]\n"+
                         "Edits all your VMs /etc/hosts file to be able to find all the machines on your private network"
             o.separator ""
-           
+
             o.on("-q", "--quiet", "(Optional) Suppress output to STDOUT and STDERR") do |f|
               options[:quiet] = true
             end
-            
+
             o.on("-n", "--no-write-hosts", "(Optional) Don't actually write a new hosts file to the guest machine") do |f|
               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|
+              options[:digitalocean] = true
+            end
+            
+            o.on("-o", "--digitaloceanfile FILE", "(Optional) File to read in for -d option instead of hostfile_do.yml") do |f|
+              options[:digitalocean_file] = f
+            end
           end
           argv = parse_options(opts)
           return if !argv
           
           
+
           hostinfo=[]
           #Go through config
           #Map hostnames to IP's
-          with_target_vms(argv, :provider => options[:provider]) do |machine|
-            return unless machine.communicate.ready?
-            hostname = machine.config.vm.hostname
-            machine.config.vm.networks.each {|networks|
-              networks.each {|net|
-                if net.is_a?(Hash) and net.has_key?(:ip)
-                  hostinfo.push(
-                    {
-                        :hostname=>hostname,
-                        :ip=>net[:ip]
-                    })
-                end                
+          if options[:digitalocean]
+            config = YAML.load_file(options[:digitalocean_file])
+            digitalocean = DigitalOcean_Api.new()
+            hostinfo = digitalocean.getHostNamesAndIps(config[:client_id],config[:api_key])
+          else
+            with_target_vms(argv, :provider => options[:provider]) do |machine|
+              return unless machine.communicate.ready?
+              hostname = machine.config.vm.hostname
+              machine.config.vm.networks.each {|networks|
+                networks.each {|net|
+                  if net.is_a?(Hash) and net.has_key?(:ip)
+                    hostinfo.push(
+                      {
+                          :hostname=>hostname,
+                          :ip=>net[:ip]
+                      })
+                  end
+                }
               }
-            }
+            end
           end
           
+          
+          #Print out Hostname and IP
+          if not options[:quiet]
+            puts "HOSTS FILE INFO:"
+            hostinfo.each {|x|
+              puts x[:hostname]+": "+x[:ip]
+            }
+          end
+
           #What we're going to add to the end of the guest's hostfile
           #A combination of IP's and hostnames
-          toconcatenate="\n"+"##ADDED BY NEVERWINTERDP'S VAGRANT-FLOW HOSTFILE COMMAND"+"\n"
+          toconcatenate="\n"+@@begin_tag_line+"\n"
           hostinfo.each {|x|
-            toconcatenate+=x[:ip]+"   "+x[:hostname]+"\n"
+            toconcatenate += x[:ip]+"   "+x[:hostname]+"\n"
           }
-          
-          
+          toconcatenate += @@end_tag_line+"\n"
+
           #Read in guest's current hosts file
           #Append our new entries to it
           #Write it out onto the guest's hosts file
           with_target_vms(argv, :provider => options[:provider]) do |machine|
             return unless machine.communicate.ready?
-            
+
             #This block of code was shamelessly stolen from
             #https://github.com/smdahlen/vagrant-hostmanager/blob/master/lib/vagrant-hostmanager/hosts_file.rb
             #Why reinvent the wheel?
@@ -87,35 +119,51 @@ module VagrantPlugins
             elsif (machine.communicate.test("test -d $Env:SystemRoot"))
               realhostfile = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
               move_cmd = 'mv -force'
-            else 
+            else
               realhostfile = '/etc/hosts'
               move_cmd = 'mv'
             end
-            
+
             #Back to my code
             #Grab Vagrant's temp file location
+            guesthostfilepath_original = @env.tmp_path.join("hosts."+machine.config.vm.hostname+".og")
             guesthostfilepath = @env.tmp_path.join("hosts."+machine.config.vm.hostname)
+
             #Download guest's hosts file
-            machine.communicate.download(realhostfile, guesthostfilepath)
-            
+            machine.communicate.download(realhostfile, guesthostfilepath_original)
+
+            #Skip everything between ##BEGIN and ##END
+            guesthostfile = File.open(guesthostfilepath, "w")
+            skip = false
+            File.open(guesthostfilepath_original, "r") do |infile|
+              while (line = infile.gets)
+                if line.strip() == @@begin_tag_line
+                  skip = true
+                elsif line.strip() == @@end_tag_line
+                  skip = false
+                else
+                  guesthostfile.write(line) if not skip
+                end
+              end
+            end
+
             #Append our hostname/IP info to the end of the hosts file
-            guesthostfile = File.open(guesthostfilepath,"a")
             guesthostfile.write(toconcatenate)
             guesthostfile.close()
-            
-            if not options[:nowrite]  
+
+            if not options[:nowrite]
               #Upload updated hosts file to guest to temp location
               machine.communicate.upload(guesthostfile.path, '/tmp/hosts')
               #Move temp file over on top of hosts file
-              machine.communicate.sudo(move_cmd+" /tmp/hosts "+realhostfile)  
+              machine.communicate.sudo(move_cmd+" /tmp/hosts "+realhostfile)
             end
           end
-          
-          
-            
+
+
+
         end
-        
-      end       
-    end    
+
+      end
+    end
   end
 end

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

@@ -0,0 +1,127 @@
+#Flush stdout immediately
+$stdout.sync = true
+
+require "vagrant"
+require 'optparse'
+require 'yaml'
+require 'pty'
+
+module VagrantPlugins
+  module CommandVagrantFlow
+    module Command
+      class Playbook < Vagrant.plugin("2", :command)
+        
+        # Builtin from Command class
+        # Must override to provide a description
+        def self.synopsis
+          "Runs ansible-playbook so you don't have to!"
+        end
+        
+        
+        # Builtin from Command class
+        # Must override to provide core functionality
+        def execute
+          options = {}
+          options[:destroy_on_error] = true
+          options[:parallel] = false
+          options[:provision_ignore_sentinel] = false
+          options[:configfile] = "flow-playbook.yml"
+          options[:print] = false
+          options[:quiet] = false
+          
+          #Parse option, look up OptionParser documentation 
+          opts = OptionParser.new do |o|
+            o.banner = "A NeverWinterDP technology from the Department of Badass.\n\n"+
+                        "Usage: vagrant flow playbook [-hfpq]\n"+
+                        "Reads in config from flow-playbook.yml by default to be able to run ansible-playbook more easily"
+            o.separator ""
+           
+            o.on("-f", "--file-playbook FILE", "(Optional) Use a specified playbook config file instead of default (flow-playbook.yml)") do |f|
+              options[:configfile] = f
+            end
+            
+            o.on("-p", "--print-only", "(Optional) Don't actually ansible-playbook, but just output what would be run to STDOUT") do |f|
+              options[:print] = true
+            end
+            
+            o.on("-q", "--quiet", "(Optional) Suppress output to STDOUT and STDERR") do |f|
+              options[:quiet] = true
+            end
+            
+          end
+          argv = parse_options(opts)
+          return if !argv
+          
+          config={}
+          begin
+            #Load YAML
+            config = YAML.load_file(options[:configfile])
+          rescue
+            #Give warning if no file could be found
+            if not options[:quiet]
+              warn "Could not open file: "+options[:configfile].to_s
+            end
+          end
+          
+          #Bail out if config is fubar
+          if not config.has_key?(:playbook)
+            if not options[:quiet]
+              warn options[:configfile].to_s+" is missing \":playbook\" key"
+            end
+            return
+          end
+          
+          if not config.has_key?(:inventory)
+            if not options[:quiet]
+              warn options[:configfile].to_s+" is missing \":inventory\" key"
+            end
+            return
+          end
+          
+          #Build the ansible-playbook command
+          command = "ansible-playbook "
+          if config.has_key?(:pattern)
+            command+= "-l "+config[:pattern]+" "
+          end
+          command+= "-i "+config[:inventory]+" "
+          command+= config[:playbook]
+          
+          #If print is specified, only output the command
+          if options[:print]
+            #But only print if the quiet command isn't specified 
+            if not options[:quiet]
+              puts command
+            end
+          else
+            
+          
+          #Run the command
+          #this fancy block of code outputs the output in real time
+          begin
+            PTY.spawn( "#{command}" ) do |stdin, stdout, pid|
+              begin
+                stdin.each { |line|
+                  if not options[:quiet]
+                    puts line
+                  end
+                }
+                #This wait() is required to set the exit code
+                Process.wait(pid)
+              rescue Errno::EIO
+              end
+            end
+          rescue PTY::ChildExited
+            #If there was an error, throw an error ourselves
+            raise Vagrant::Errors::AnsibleFailed
+          end
+          
+          #If there was an error, throw an error ourselves
+          raise Vagrant::Errors::AnsibleFailed if not $?.success?
+            
+          end
+        end
+        
+      end       
+    end    
+  end
+end

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

@@ -28,6 +28,11 @@ module VagrantPlugins
             require_relative "hostfile"
             HostFile
           end
+          
+          @subcommands.register(:playbook) do
+            require_relative "playbook"
+            Playbook
+          end
 
         end
 

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

@@ -19,11 +19,28 @@ 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"]%>"
     
+    #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.image = '<%= machine["digitalOceanImage"] %>'
+    end
+    <% end %>
+    
+    
+    #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.10"
+    VERSION = "1.0.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Steve Morin
@@ -50,12 +50,18 @@ files:
 - NEVERWINTERDP
 - README.md
 - Rakefile
+- VAGRANT-FLOW
 - create_sample_ansible-inventory_input-file.rb
+- create_sample_hostfile_digitalocean_input-file.rb
 - create_sample_multiinit_input-file.rb
+- create_sample_multiinit_input-file_digitalocean.rb
+- create_sample_playbook_input-file.rb
 - lib/vagrant-flow.rb
 - lib/vagrant-flow/command/ansibleinventory.rb
+- lib/vagrant-flow/command/digitalocean_api.rb
 - lib/vagrant-flow/command/hostfile.rb
 - lib/vagrant-flow/command/multiinit.rb
+- lib/vagrant-flow/command/playbook.rb
 - lib/vagrant-flow/command/root.rb
 - lib/vagrant-flow/plugin.rb
 - lib/vagrant-flow/templates/multiinit.erb