vagrant-flow 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987d348d2383b329ac2e6d646ffb9a84da357da2
-  data.tar.gz: 11aaca9f68aa6db12f372e3eb92c29c1c8fd6395
+  metadata.gz: 01e8dbb3fea3a1fbb847bb1427a22100522c319e
+  data.tar.gz: ea5cdedd8094a8064acc02016719784f93b72fb6
 SHA512:
-  metadata.gz: 4c335c7777a4c0f1684b3dbda635c78b14877aa679754d2fffdc2a672c9f9285d57611ea019090597165ff0cbc136e4e15d8c8d75e5893700a3009d064170aa5
-  data.tar.gz: 21e55b67a680606edccfbe4cb57e7dbf8735eac405117de095fadeae97f0e46b443c3f7522e7955b7dda7db11d63ac7a4bbb58452760b691d18b39e79cd3269e
+  metadata.gz: 281baccfccb78752d0181fcd23b7cb0db8e05950809e0e0689974a0c87b340a5dafe069047e05586789b3166c5198b44cc4be741c63c6f3210970dc9e9bbb64e
+  data.tar.gz: fb1543c977bcb2f86f89f1d9ea95128ebbf240590316e80aaf85851cfe772cfddde11624d9036edd1ab07b2327441c70727d34e1217e3f9f3157eefc23f3a2a9

data/README.md

@@ -22,9 +22,12 @@ Or install it yourself as:
 
     $ gem install vagrant-flow
 
-## Usage
+* * *
+
+# Usage
+## ansibleinventory
 ```
-Usage: vagrant ansible-inventory [-hgpq]
+Usage: vagrant flow ansibleinventory [-hgpq]
 This plugin looks for groupconfig.yml as the default configuration
 Do not use -p and -g options together!
 
@@ -34,31 +37,31 @@ Do not use -p and -g options together!
     -h, --help                       (Optional) Print this help
 ```
 
-## Example usages
+#### Example usages of ansibleinventory
 This will look for a file in the pwd named groupconfig.yml and attempt to make the inventory
 ```
-vagrant ansible-inventory
+vagrant flow ansibleinventory
 ```
 
 
 
 This will look for a file in the pwd named myOwnGroupConfig.yml and attempt to make the inventory
 ```
-vagrant ansible-inventory -g myOwnGroupConfig.yml
+vagrant flow ansibleinventory -g myOwnGroupConfig.yml
 ```
 
 
 
 This will parse the vagrant file for ansible group configs
 ```
-vagrant ansible-inventory -p
+vagrant flow ansibleinventory -p
 ```
 
 
 
 
 
-## Use case
+### Use case
 ```
 #Bring up your vagrant machines
 vagrant up
@@ -67,8 +70,6 @@ vagrant ansible-inventory
 #point ansible-playbook to the generated vagrant-flow_ansible_inventory, and point them to whatever playbook you'd like
 ansible-playbook -i path/to/vagrant-flow_ansible_inventory my_playbook.yml
 ```
-## Usage Expectations
-#### Don't mix the -p and -g options.  Unexpected things will happen.
 
 Example groupconfig.yml file (for use with no optional command line arguments or  by pointing to non-default file with -g option)
 ```
@@ -117,7 +118,66 @@ Example playbook.yml to use after ansible-inventory has run with command `ansibl
   roles:
     - apache
 ```
+* * *
+## multiinit
+```
+Usage: vagrant flow multiinit [-hgliq]
+This looks for multiinit.yml as the default configuration
+
+    -g FILEPATH,                     (Optional) YAML file containing vagrant cloud config
+        --vagrant_multiinit_config_file
+    -l hostname:cloud/location,hostname2:cloud/location2,hostname3:cloud/location3,
+        --list                       List of cloud config parameters
+    -i, --vboxintnet NAME            (Optional) Custom virtualbox__intnet name for private network
+    -q, --quiet                      (Optional) Suppress output to STDOUT and STDERR
+    -h, --help                       Print this help
+```
+
+#### Example usages of multiinit
+This will look for a file in the pwd named multiinit.yml and attempt to make the Vagrantfile
+```
+vagrant flow multiinit
+```
+
+
+
+This will look for a file in the pwd named myOwnGroupConfig.yml and attempt to make the inventory
+```
+vagrant flow multiinit -g myOwnMultiInitConfig.yml
+```
+
+
+
+This will read in from the command line a list of [vm_name]:[url] combinations.  It MUST follow the following format.  The -i option will also set the virtualbox__intnet name to a custom option ("virtualboxprivatenet" in this case)
+```
+vagrant flow multiinit -l boxname1:demandcube/centos-65_x86_64-VB-4.3.8,boxname2:demandcube/centos-65_x86_65-VB-4.3.8,box3:provider/boxname -i virtualboxprivatenet
+```
+
+
+### Use case
+```
+#Create your multi-box Vagrantfile
+vagrant flow multiinit
+#Launch the boxes
+vagrant up
+```
+
+Example multiinitconfig.yml file (for use with no optional command line arguments or by pointing to non-default file with -g option).  The format of this yaml file MUST be followed, but can easily be expanded to include more of fewer machines
+```
+---
+:intnetName: neverwinterDP
+machines:
+- name: machine1
+  url: demandcube/centos-65_x86_64-VB-4.3.8
+- name: server1
+  url: demandcube/centos-64_x86_64-VB-4.3.8
+- name: jenkinstestmachine
+  url: demandcube/centos-65_x86_64-VB-4.3.8
+
+```
+
 
+* * *
 
 ## Contributing
 
@@ -157,7 +217,7 @@ rake release
 
 # install for real from the repo
 
-vagrant plugin vagrant-flow
+vagrant plugin install vagrant-flow
 ```
 
 # Background Research

data/create_sample_multiinit_input-file.rb

@@ -0,0 +1,30 @@
+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 = {
+  :intnetName=>"neverwinterDP",
+  "machines" => [
+   {"name"=>"sparkngin1", "url"=>"demandcube/centos-65_x86_64-VB-4.3.8"},
+   {"name"=>"sparkngin2", "url"=>"demandcube/centos-65_x86_64-VB-4.3.8"},
+   {"name"=>"jenkinsdp", "url"=>"demandcube/centos-65_x86_64-VB-4.3.8"},
+  ]
+}
+
+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/lib/vagrant-flow/command/ansibleinventory.rb

@@ -0,0 +1,258 @@
+require 'optparse'
+require "vagrant"
+require "yaml"
+
+module VagrantPlugins
+  module CommandVagrantFlow
+    module Command
+      class AnsibleInventory < Vagrant.plugin("2", :command)
+        
+        # Builtin from Command class
+        # Must override to provide a description
+        def self.synopsis
+          "generates a ansible inventory file from the vagrant environment"
+        end
+  
+        
+        # Builtin from Command class
+        # Must override to provide core functionality
+        def execute
+          
+          machines_configs = {}
+          inventory_configs = {}
+          
+          default_group_config_file = "groupconfig.yml"
+          options = {}
+          options[:destroy_on_error] = true
+          options[:parallel] = false
+          options[:provision_ignore_sentinel] = false
+          options[:quiet] = false
+          
+          #Setting to read in a file other than default_group_config_File
+          options[:custom_config_file] = false
+          #Setting to parse the VAGRANTFILE's ansible group config
+          options[:vagrantFileAnsibleConfig] = false
+          
+          #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 ansibleinventory [-hgpq]\nThis looks for groupconfig.yml as the default configuration\n"+
+                        "Do not use -p and -g options together!"
+            o.separator ""
+            o.on("-g", "--group_config_file FILEPATH", "(Optional) YAML file containing group config") do |f|
+              options[:custom_config_file] = f        
+            end
+            
+            o.on("-p", "--vagrantfileparse", "(Optional) Read in the VAGRANTFILE's ansible group config") do |f|
+              options[:vagrantFileAnsibleConfig] = true
+            end
+            
+            o.on("-q", "--quiet", "(Optional) Suppress output to STDOUT and STDERR") do |f|
+              options[:quiet] = true
+            end
+            
+          end
+  
+          # Parse the options # Builtin from the Command Class
+          # Will safely parse the arguments and 
+          # Automatically detects -h for help
+          argv = parse_options(opts)
+          return if !argv
+          
+          
+  
+          # The following are already setup by the parent class
+          # @env
+          # @logger
+          # @argv
+  
+          # Go over each VM and bring it up
+          @logger.debug("'ansible-inventory' created for the whole env")
+          
+          #Initialize group_machines, the has containing group=>machinename configs
+          group_machines={}
+          
+          #Get info about the vagrant boxes
+          with_target_vms(argv, :provider => options[:provider]) do |machine|
+            # @env.ui
+            # output methods: :ask, :detail, :warn, :error, :info, :output, :success
+            # https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/ui.rb
+            
+            ssh_info = machine.ssh_info
+            raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
+  
+            variables = {
+              :host_key => options[:host] || machine.name || "vagrant",
+              :ssh_host => ssh_info[:host],
+              :ssh_port => ssh_info[:port],
+              :ssh_user => ssh_info[:username],
+              :private_key_path => ssh_info[:private_key_path],
+              :forward_agent => ssh_info[:forward_agent],
+              :forward_x11   => ssh_info[:forward_x11]
+            }
+            # Outputs to the stdout
+            
+            inventory_configs = {
+              :vagrant_file_dir => machine.env.root_path,
+              :vagrant_flow_file => machine.env.root_path.join("vagrant-flow_ansible_inventory")
+            }
+            
+            machines_configs[variables[:host_key]]= variables
+          end
+          
+          #Hash containing group/machine configuration
+          group_machines={}
+          #Determine group_machines based on what config options are passed in
+          #Read in config from vagrantfile's ansible config
+          if options[:vagrantFileAnsibleConfig] == true
+            provisioners = []
+            with_target_vms(argv, :provider => options[:provider]) do |machine|
+              #The provisioning information from teh vagrant file, this will contain our defined ansible groups
+              #Concatenate all the provisioner configs together
+              if machine.config.vm.provisioners
+                provisioners.concat(machine.config.vm.provisioners)
+              end
+            end
+            #Since Vagrant machines will likely contain the same configs,
+            #Merge the config together to remove duplicate entries in our
+            #group/machine configuration
+            provisioners.each {|prov|
+              group_machines = group_machines.merge(prov.config.groups)
+            }
+          #Read in config from yaml file
+          else
+            #Use config option if specified
+            if options[:custom_config_file] != false
+                default_group_config_file = options[:custom_config_file]
+            end
+            begin
+              #Load YAML
+              group_machines = YAML.load_file(default_group_config_file)
+            rescue
+              #Give warning if no file could be found
+              if not options[:quiet]
+                warn "Could not open file: "+default_group_config_file.to_s
+              end
+            end
+          end
+          
+          
+          
+          # Outputs to the stdout
+          # @env.ui.info(machine.name)
+          
+          # From - Vagrant::Util::SafePuts
+          # Template is erb
+          
+          # Implementation picks the first key
+          # ssh_info[:private_key_path] returns an array
+   
+          #outputs is going to contain our strings that are the formatted ansible configs
+          #the key will be the vm name, the value will the be formatted sring
+          outputs = {}
+          
+          inventory_configs[:vagrant_flow_file].open('w') do |file|
+            machines_configs.each do |host, variables|
+              ansible_template = '<%= host_key %> ansible_ssh_host=<%= ssh_host %> ansible_ssh_port=<%= ssh_port %> ansible_ssh_user=<%= ssh_user %> ansible_ssh_private_key_file=<%= private_key_path[0] %> # Machine Name: <%= host_key %>'
+              outputs[variables[:host_key]] = Vagrant::Util::TemplateRenderer.render_string(ansible_template, variables)
+              #safe_puts(host_txt)
+              #file.write("#{host_txt}\n")
+            end
+          end
+          
+          #require 'pp'
+          #puts "PROVISIONERS"
+          #PP.pp(provisioners)
+          #puts "OUTPUTS"
+          #PP.pp(outputs)
+          #puts "\n\n"
+          
+          
+          
+          inventory_configs[:vagrant_flow_file].open('w') do |file|
+            header_txt="# Generated by vagrant-flow, part of NeverwinterDP\n\n"
+            if not options[:quiet]
+              safe_puts(header_txt)
+            end
+            file.write(header_txt)
+            
+            #Now we maps from our VAGRANTFILE defined groups in our provisioners.config.groups
+            #To our configuration strings we got from outputs
+            group_machines.each do |groupname,machines|
+              if not options[:quiet]
+                puts "["+groupname+"]\n"
+              end
+              file.write "["+groupname+"]\n"
+              machines.each do |machinename|
+                #if we match :children, then we have an ansible config that's
+                #pointing to another group, not a specific machine
+                if /:children/.match(groupname)
+                  if not options[:quiet]
+                    puts machinename
+                  end
+                  file.write machinename+"\n"
+                else
+                  if not options[:quiet]
+                    puts outputs[machinename.to_sym]+"\n"
+                  end
+                  file.write outputs[machinename.to_sym]+"\n"
+                end
+              end
+              if not options[:quiet]
+                puts "\n"
+              end
+              file.write "\n"
+            end    
+          end          
+          0
+        end # End Execute
+        
+        
+        # Documentation reference
+        # http://docs.ansible.com/intro_inventory.html
+        
+        #def setup_inventory_file(machine)
+        #  return machine.config.inventory_path if machine.config.inventory_path
+        #
+        #  ssh = machine.ssh_info
+        #
+        #  generated_inventory_file =
+        #    machine.env.root_path.join("vagrant-flow_ansible_inventory")
+        #
+        #  generated_inventory_file.open('w') do |file|
+        #    file.write("# Generated by Vagrant\n\n")
+        #    file.write("#{machine.name} ansible_ssh_host=#{ssh[:host]} ansible_ssh_port=#{ssh[:port]}\n")
+        #
+        #    # Write out groups information.  Only include current
+        #    # machine and its groups to avoid Ansible errors on
+        #    # provisioning.
+        #    groups_of_groups = {}
+        #    included_groups = []
+        #
+        #    config.groups.each_pair do |gname, gmembers|
+        #      if gname.end_with?(":children")
+        #        groups_of_groups[gname] = gmembers
+        #      elsif gmembers.include?("#{machine.name}")
+        #        included_groups << gname
+        #        file.write("\n[#{gname}]\n")
+        #        file.write("#{machine.name}\n")
+        #      end
+        #    end
+        #
+        #    groups_of_groups.each_pair do |gname, gmembers|
+        #      unless (included_groups & gmembers).empty?
+        #        file.write("\n[#{gname}]\n")
+        #        gmembers.each do |gm|
+        #          file.write("#{gm}\n") if included_groups.include?(gm)
+        #        end
+        #      end
+        #    end
+        #  end
+        #
+        #  return generated_inventory_file.to_s
+        #end
+      end       
+    end    
+  end
+end

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

@@ -0,0 +1,155 @@
+require "vagrant"
+require 'optparse'
+require "yaml"
+require 'erubis'
+require "ipaddr"
+
+module VagrantPlugins
+  module CommandVagrantFlow
+    module Command
+      class MultiInit < Vagrant.plugin("2", :command)
+        
+        # Builtin from Command class
+        # Must override to provide a description
+        def self.synopsis
+          "Grabs a multitude of vagrant cloud boxes"
+        end
+        
+        
+        # Builtin from Command class
+        # Must override to provide core functionality
+        def execute
+          default_group_config_file = "multiinitconfig.yml"
+          options = {}
+          options[:destroy_on_error] = true
+          options[:parallel] = false
+          options[:provision_ignore_sentinel] = false
+          options[:quiet] = false
+          
+          #Default virtualbox__intnet name for private network
+          options[:vboxintnet] = "neverwinterDP"
+          
+          #Setting to read in a file other than default_group_config_File
+          options[:vagrant_cloud_config_file] = false
+          
+          #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 multiinit [-hgliq]\nThis looks for multiinit.yml as the default configuration\n"
+            o.separator ""
+            o.on("-g", "--vagrant_multiinit_config_file FILEPATH", "(Optional) YAML file containing vagrant cloud config") do |f|
+              options[:vagrant_cloud_config_file] = f        
+            end
+            
+            o.on( '-l', '--list hostname:cloud/location,hostname2:cloud/location2,hostname3:cloud/location3', Array, "List of cloud config parameters" ) do|f|
+              options[:vagrant_cloud_list] = f
+            end
+            
+            o.on("-i", "--vboxintnet NAME", "(Optional) Custom virtualbox__intnet name for private network") do |f|
+              options[:vboxintnet] = f
+            end
+            
+            o.on("-q", "--quiet", "(Optional) Suppress output to STDOUT and STDERR") do |f|
+              options[:quiet] = true
+            end
+            
+          end
+  
+          # Parse the options # Builtin from the Command Class
+          # Will safely parse the arguments and 
+          # Automatically detects -h for help
+          argv = parse_options(opts)
+          return if !argv
+          
+          
+          #If no options are given, set the config file to the default
+          #and continue on our merry way
+          if not options[:vagrant_cloud_config_file] and not options[:vagrant_cloud_list]
+            options[:vagrant_cloud_config_file] = default_group_config_file
+          end
+          
+          #Get machine configs from config file or from command line
+          content = {}
+          if options[:vagrant_cloud_config_file]
+            begin
+              #Load YAML
+              content = YAML.load_file(options[:vagrant_cloud_config_file])
+            rescue
+              #Give warning if no file could be found
+              if not options[:quiet]
+                warn "Could not open file: "+options[:vagrant_cloud_config_file].to_s
+              end
+            end
+            
+            #Set intnetName if its not in the config
+            if not content.has_key?(:intnetName)
+              content[:intnetName]=options[:vboxintnet]
+            end
+            
+          end
+          
+          #Read in command line config
+          if options[:vagrant_cloud_list]
+            machines = []
+            options[:vagrant_cloud_list].each {|item|
+              split = item.split(":")
+              machines.push({
+                              "name"=>split[0],
+                              "url"=>split[1],
+                              })
+            }
+            content = {
+              :intnetName=>options[:vboxintnet],
+              "machines" => machines,
+            }
+          end
+          
+          #Bail out here if content is fubar
+          if not content.has_key?("machines")
+            return
+          end
+          
+          #Set IP's for private network
+          #Start at 192.168.1.0 and increment up
+          #using the IPAddr class
+          ip= IPAddr.new("192.168.1.0")
+          content["machines"].each {|machine|
+            ip = IPAddr.new(ip.to_s).succ
+            
+            #If IP ends in x.x.x.0 or x.x.x.1, keep going one more
+            #to avoid conflicts with routers/gateways/etc
+            if ip.to_s.split(//).last(2) == [".","0"]
+              ip = IPAddr.new(ip.to_s).succ
+            end
+            if ip.to_s.split(//).last(2) == [".","1"]
+              ip = IPAddr.new(ip.to_s).succ
+            end
+            machine["ip"] =   ip.to_s
+          }
+          
+          
+          #Put Vagrantfile in pwd
+          save_path = Pathname.new("Vagrantfile").expand_path(@env.cwd)
+          
+          #Error out if Vagrantfile already exists
+          raise Vagrant::Errors::VagrantfileExistsError if save_path.exist?
+          
+          #Get current directory, go up one directory, then append path to templates/cloudbox.erb
+          template_path = File.join(File.expand_path("..",File.dirname(__FILE__)) , ("templates/multiinit.erb"))
+          
+          #Load template file and write contents
+          eruby = Erubis::Eruby.new(File.read(template_path))
+          begin
+            save_path.open("w+") do |f|
+              f.write(eruby.evaluate(content))
+            end
+          rescue Errno::EACCES
+            raise Vagrant::Errors::VagrantfileWriteError
+          end
+          
+        end
+      end       
+    end    
+  end
+end

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

@@ -0,0 +1,70 @@
+require 'optparse'
+
+module VagrantPlugins
+  module CommandVagrantFlow
+    module Command
+      class Root < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "manages vagrantflow"
+        end
+
+        def initialize(argv, env)
+          super
+
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:ansibleinventory) do
+            require_relative "ansibleinventory"
+            AnsibleInventory
+          end
+          
+          @subcommands.register(:multiinit) do
+            require_relative "multiinit"
+            MultiInit
+          end
+
+        end
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the sub-commands.
+            return help
+          end
+
+          # If we reached this far then we must have a subcommand. If not,
+          # then we also just print the help and exit.
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        # Prints the help out for this command
+        def help
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant flow <command> [<args>]"
+            o.separator ""
+            o.separator "Available subcommands: ansibleinventory,"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              o.separator "     #{key}"
+            end
+
+            o.separator ""
+            o.separator "For help on any individual command run `vagrant flow COMMAND -h`"
+          end
+
+          @env.ui.info(opts.help, :prefix => false)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-flow/plugin.rb

@@ -1,5 +1,7 @@
+require "vagrant"
+
 module VagrantPlugins
-  module VagrantFlow
+  module CommandVagrantFlow
     class Plugin < Vagrant.plugin(2)
 
       name 'vagrant-flow'
@@ -10,11 +12,17 @@ module VagrantPlugins
       #   Config
       # end
 
-      command("ansible-inventory") do
-        require_relative 'command'
-        Command
+      #command("ansible-inventory") do
+      #  require_relative 'command'
+      #  Command
+      #end
+      
+      
+      command("flow") do
+        require File.expand_path("../command/root.rb", __FILE__)
+        Command::Root
       end
-
+      
     end # Plugin
   end # Exec
 end # VagrantPlugins

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

@@ -0,0 +1,29 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  
+  Vagrant.require_version ">= 1.4.3"
+
+  
+
+<% for machine in @machines %>
+
+  config.vm.define :<%= machine["name"]%> do | <%= machine["name"]%> |
+    <%= machine["name"]%>.vm.box = "<%= machine["url"]%>"
+    
+    # Create a private network
+    <%= machine["name"]%>.vm.network :private_network, ip: "<%= machine["ip"]%>", virtualbox__intnet: "<%= @intnetName %>"
+    <%= machine["name"]%>.vm.hostname = "<%= machine["name"]%>"
+    
+    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.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Steve Morin
@@ -51,9 +51,13 @@ files:
 - README.md
 - Rakefile
 - create_sample_ansible-inventory_input-file.rb
+- create_sample_multiinit_input-file.rb
 - lib/vagrant-flow.rb
-- lib/vagrant-flow/command.rb
+- lib/vagrant-flow/command/ansibleinventory.rb
+- lib/vagrant-flow/command/multiinit.rb
+- lib/vagrant-flow/command/root.rb
 - lib/vagrant-flow/plugin.rb
+- lib/vagrant-flow/templates/multiinit.erb
 - lib/vagrant-flow/version.rb
 - vagrant-flow.gemspec
 homepage: http://github.com/DemandCube/vagrant-flow

data/lib/vagrant-flow/command.rb

@@ -1,257 +0,0 @@
-require 'optparse'
-require "vagrant"
-require "yaml"
-
-module VagrantPlugins
-  module VagrantFlow
-    class Command < Vagrant.plugin("2", :command)
-      
-      # Builtin from Command class
-      # Must override to provide a description
-      def self.synopsis
-        "generates a ansible inventory file from the vagrant environment"
-      end
-
-      
-      # Builtin from Command class
-      # Must override to provide core functionality
-      def execute
-        
-        machines_configs = {}
-        inventory_configs = {}
-        
-        default_group_config_file = "groupconfig.yml"
-        options = {}
-        options[:destroy_on_error] = true
-        options[:parallel] = false
-        options[:provision_ignore_sentinel] = false
-        options[:quiet] = false
-        
-        #Setting to read in a file other than default_group_config_File
-        options[:custom_config_file] = false
-        #Setting to parse the VAGRANTFILE's ansible group config
-        options[:vagrantFileAnsibleConfig] = false
-        
-        #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 ansible-inventory [-hgpq]\nThis looks for groupconfig.yml as the default configuration\n"+
-                      "Do not use -p and -g options together!"
-          o.separator ""
-          o.on("-g", "--group_config_file FILEPATH", "(Optional) YAML file containing group config") do |f|
-            options[:custom_config_file] = f        
-          end
-          
-          o.on("-p", "--vagrantfileparse", "(Optional) Read in the VAGRANTFILE's ansible group config") do |f|
-            options[:vagrantFileAnsibleConfig] = true
-          end
-          
-          o.on("-q", "--quiet", "(Optional) Suppress output to STDOUT and STDERR") do |f|
-            options[:quiet] = true
-          end
-          
-        end
-
-        # Parse the options # Builtin from the Command Class
-        # Will safely parse the arguments and 
-        # Automatically detects -h for help
-        argv = parse_options(opts)
-        return if !argv
-        
-        
-
-        # The following are already setup by the parent class
-        # @env
-        # @logger
-        # @argv
-
-        # Go over each VM and bring it up
-        @logger.debug("'ansible-inventory' created for the whole env")
-        
-        #Initialize group_machines, the has containing group=>machinename configs
-        group_machines={}
-        
-        #Get info about the vagrant boxes
-        with_target_vms(argv, :provider => options[:provider]) do |machine|
-          # @env.ui
-          # output methods: :ask, :detail, :warn, :error, :info, :output, :success
-          # https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/ui.rb
-          
-          ssh_info = machine.ssh_info
-          raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
-
-          variables = {
-            :host_key => options[:host] || machine.name || "vagrant",
-            :ssh_host => ssh_info[:host],
-            :ssh_port => ssh_info[:port],
-            :ssh_user => ssh_info[:username],
-            :private_key_path => ssh_info[:private_key_path],
-            :forward_agent => ssh_info[:forward_agent],
-            :forward_x11   => ssh_info[:forward_x11]
-          }
-          # Outputs to the stdout
-          
-          inventory_configs = {
-            :vagrant_file_dir => machine.env.root_path,
-            :vagrant_flow_file => machine.env.root_path.join("vagrant-flow_ansible_inventory")
-          }
-          
-          machines_configs[variables[:host_key]]= variables
-        end
-        
-        #Hash containing group/machine configuration
-        group_machines={}
-        #Determine group_machines based on what config options are passed in
-        #Read in config from vagrantfile's ansible config
-        if options[:vagrantFileAnsibleConfig] == true
-          provisioners = []
-          with_target_vms(argv, :provider => options[:provider]) do |machine|
-            #The provisioning information from teh vagrant file, this will contain our defined ansible groups
-            #Concatenate all the provisioner configs together
-            if machine.config.vm.provisioners
-              provisioners.concat(machine.config.vm.provisioners)
-            end
-          end
-          #Since Vagrant machines will likely contain the same configs,
-          #Merge the config together to remove duplicate entries in our
-          #group/machine configuration
-          provisioners.each {|prov|
-            group_machines = group_machines.merge(prov.config.groups)
-          }
-        #Read in config from yaml file
-        else
-          #Use config option if specified
-          if options[:custom_config_file] != false
-              default_group_config_file = options[:custom_config_file]
-          end
-          begin
-            #Load YAML
-            group_machines = YAML.load_file(default_group_config_file)
-          rescue
-            #Give warning if no file could be found
-            if not options[:quiet]
-              warn "Could not open file: "+default_group_config_file.to_s
-            end
-          end
-        end
-        
-        
-        
-        # Outputs to the stdout
-        # @env.ui.info(machine.name)
-        
-        # From - Vagrant::Util::SafePuts
-        # Template is erb
-        
-        # Implementation picks the first key
-        # ssh_info[:private_key_path] returns an array
- 
-        #outputs is going to contain our strings that are the formatted ansible configs
-        #the key will be the vm name, the value will the be formatted sring
-        outputs = {}
-        
-        inventory_configs[:vagrant_flow_file].open('w') do |file|
-          machines_configs.each do |host, variables|
-            ansible_template = '<%= host_key %> ansible_ssh_host=<%= ssh_host %> ansible_ssh_port=<%= ssh_port %> ansible_ssh_user=<%= ssh_user %> ansible_ssh_private_key_file=<%= private_key_path[0] %> # Machine Name: <%= host_key %>'
-            outputs[variables[:host_key]] = Vagrant::Util::TemplateRenderer.render_string(ansible_template, variables)
-            #safe_puts(host_txt)
-            #file.write("#{host_txt}\n")
-          end
-        end
-        
-        #require 'pp'
-        #puts "PROVISIONERS"
-        #PP.pp(provisioners)
-        #puts "OUTPUTS"
-        #PP.pp(outputs)
-        #puts "\n\n"
-        
-        
-        
-        inventory_configs[:vagrant_flow_file].open('w') do |file|
-          header_txt="# Generated by vagrant-flow, part of NeverwinterDP\n\n"
-          if not options[:quiet]
-            safe_puts(header_txt)
-          end
-          file.write(header_txt)
-          
-          #Now we maps from our VAGRANTFILE defined groups in our provisioners.config.groups
-          #To our configuration strings we got from outputs
-          group_machines.each do |groupname,machines|
-            if not options[:quiet]
-              puts "["+groupname+"]\n"
-            end
-            file.write "["+groupname+"]\n"
-            machines.each do |machinename|
-              #if we match :children, then we have an ansible config that's
-              #pointing to another group, not a specific machine
-              if /:children/.match(groupname)
-                if not options[:quiet]
-                  puts machinename
-                end
-                file.write machinename+"\n"
-              else
-                if not options[:quiet]
-                  puts outputs[machinename.to_sym]+"\n"
-                end
-                file.write outputs[machinename.to_sym]+"\n"
-              end
-            end
-            if not options[:quiet]
-              puts "\n"
-            end
-            file.write "\n"
-          end    
-        end          
-        0
-      end # End Execute
-      
-      
-      # Documentation reference
-      # http://docs.ansible.com/intro_inventory.html
-      
-      def setup_inventory_file(machine)
-        return machine.config.inventory_path if machine.config.inventory_path
-
-        ssh = machine.ssh_info
-
-        generated_inventory_file =
-          machine.env.root_path.join("vagrant-flow_ansible_inventory")
-
-        generated_inventory_file.open('w') do |file|
-          file.write("# Generated by Vagrant\n\n")
-          file.write("#{machine.name} ansible_ssh_host=#{ssh[:host]} ansible_ssh_port=#{ssh[:port]}\n")
-
-          # Write out groups information.  Only include current
-          # machine and its groups to avoid Ansible errors on
-          # provisioning.
-          groups_of_groups = {}
-          included_groups = []
-
-          config.groups.each_pair do |gname, gmembers|
-            if gname.end_with?(":children")
-              groups_of_groups[gname] = gmembers
-            elsif gmembers.include?("#{machine.name}")
-              included_groups << gname
-              file.write("\n[#{gname}]\n")
-              file.write("#{machine.name}\n")
-            end
-          end
-
-          groups_of_groups.each_pair do |gname, gmembers|
-            unless (included_groups & gmembers).empty?
-              file.write("\n[#{gname}]\n")
-              gmembers.each do |gm|
-                file.write("#{gm}\n") if included_groups.include?(gm)
-              end
-            end
-          end
-        end
-
-        return generated_inventory_file.to_s
-      end
-      
-    end
-  end
-end