vagrant-flow 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01e8dbb3fea3a1fbb847bb1427a22100522c319e
-  data.tar.gz: ea5cdedd8094a8064acc02016719784f93b72fb6
+  metadata.gz: ed22614eed524505d9e9152a08ed39f8d6a58742
+  data.tar.gz: 2108ba81c16ea08078a6ee9d0aaabe76d00defc5
 SHA512:
-  metadata.gz: 281baccfccb78752d0181fcd23b7cb0db8e05950809e0e0689974a0c87b340a5dafe069047e05586789b3166c5198b44cc4be741c63c6f3210970dc9e9bbb64e
-  data.tar.gz: fb1543c977bcb2f86f89f1d9ea95128ebbf240590316e80aaf85851cfe772cfddde11624d9036edd1ab07b2327441c70727d34e1217e3f9f3157eefc23f3a2a9
+  metadata.gz: 7ad70c3ef275f2e791416ee322cf8cea97019b3d3380ae7b503d8287a95ea5b69d039c0ef58f4e7a3991c9d451db6f6313dfc8b298aa122d52709090f77dd187
+  data.tar.gz: 5501496525b98e3f696e3f43caf7490466e2d611aa2cc364b1c4f2ba95471c116effdebad7095c912bb6ce0724fa3387e22ea8eb4f551c0e430f09c87a8d9769

data/README.md

@@ -25,6 +25,100 @@ Or install it yourself as:
 * * *
 
 # Usage
+
+
+* * *
+## 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
+
+```
+
+* * *
+##hostfile
+Usage: vagrant flow hostfile [-hnkq]
+Edits all your VMs /etc/hosts file to be able to find all the machines on your private network
+
+    -q, --quiet                      (Optional) Suppress output to STDOUT and STDERR
+    -n, --no-write-hosts             (Optional) Don't actually write a new hosts file to the guest machine
+    -h, --help                       Print this help
+
+#### Example usages of hostfile
+This will look through your vagrantfile config, find all the hostnames and IP's configured in your private_network, and append that information to all your machine's /etc/hosts file
+```
+vagrant flow hostfile
+```
+
+Example Vagrantfile excerpt.  This configuration is required by hostfile to be able to determine IP addresses and hostnames.
+If you're already using vagrant flow multiinit, then this configuration is already take care of
+```
+  config.vm.define :server1 do | server1 |
+    server1.vm.box = "demandcube/centos-65_x86_64-VB-4.3.8"
+    # Create a private network
+    server1.vm.network :private_network, ip: "192.168.1.2", virtualbox__intnet: "neverwinterDP"
+    server1.vm.hostname = "server1"
+  end
+
+  config.vm.define :server2 do | server2 |
+    server2.vm.box = "demandcube/centos-65_x86_64-VB-4.3.8"
+    # Create a private network
+    server2.vm.network :private_network, ip: "192.168.1.3", virtualbox__intnet: "neverwinterDP"
+    server2.vm.hostname = "server2"
+  end
+```
+
+* * *
 ## ansibleinventory
 ```
 Usage: vagrant flow ansibleinventory [-hgpq]
@@ -66,7 +160,7 @@ vagrant flow ansibleinventory -p
 #Bring up your vagrant machines
 vagrant up
 #Run ansible inventory (this assumes the file groupconfig.yml exists)
-vagrant ansible-inventory
+vagrant flow ansibleinventory
 #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
 ```
@@ -118,67 +212,56 @@ 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
+Example output (file will be called vagrant-flow_ansible_inventory)
 ```
+# Generated by vagrant-flow, part of NeverwinterDP
 
+[testgroup]
+jenkins ansible_ssh_host=127.0.0.1 ansible_ssh_port=2201 ansible_ssh_user=vagrant ansible_ssh_private_key_file=/Users/rcduar/.vagrant.d/insecure_private_key # Machine Name: jenkins
 
+[servergroup]
+server1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222 ansible_ssh_user=vagrant ansible_ssh_private_key_file=/Users/user/.vagrant.d/insecure_private_key # Machine Name: server1
 
-This will look for a file in the pwd named myOwnGroupConfig.yml and attempt to make the inventory
-```
-vagrant flow multiinit -g myOwnMultiInitConfig.yml
+[common:children]
+testgroup
+servergroup
 ```
 
+* * *
 
 
-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
-```
+## Future Usage and Specs
+Looking for vagrant-flow to have the following commands:
 
-
-### Use case
 ```
-#Create your multi-box Vagrantfile
-vagrant flow multiinit
-#Launch the boxes
-vagrant up
+init-flow
+ansible-inventory
+hostfile-local
+hostfile-remote
+flow
 ```
+- init-flow -> creates a stub Vagrant file but takes more options
+- ansible-inventory -> creates a ansible-inventory file from the virtualmachines that are there
+- hostfile-local -> create a hostfile that can be appended to your /etc/hosts locally so you can reference the vm's
+- hostfile-remote -> updates the /etc/hosts on all the vm's created by vagrant so they can talk to each other
+- flow -> calls ansible-inventory and hostfile-remote in 1 command.
 
-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
+Example flow to be enabled
 ```
----
-: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
+vagrant plugin install vagrant-flow
+git clone http://github.com/DemandCube/DeveloperPlaybooks
+mkdir devsetup
+cd devsetup
+vagrant init-flow frontend1 frontend2:ubuntu-12
+vagrant flow
+ansible-playbook -i ansible-flow_inventoryfile ../DeveloperPlaybooks/site.yml
 
+#communication test
+vagrant ssh frontend1 ping frontend2
+vagrant ssh frontend2 ping frontend1
 ```
 
-
-* * *
-
 ## Contributing
 
 1. Fork it ( http://github.com/DemandCube/vagrant-flow/fork )

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

@@ -0,0 +1,121 @@
+require "vagrant"
+require 'optparse'
+require 'tempfile'
+
+module VagrantPlugins
+  module CommandVagrantFlow
+    module Command
+      class HostFile < Vagrant.plugin("2", :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
+          options = {}
+          options[:destroy_on_error] = true
+          options[:parallel] = false
+          options[:provision_ignore_sentinel] = false
+          options[:nowrite] = false
+          options[:quiet] = 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 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
+          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                
+              }
+            }
+          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"
+          hostinfo.each {|x|
+            toconcatenate+=x[:ip]+"   "+x[:hostname]+"\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?
+            #Determines what the move command and where /etc/hosts should be for linux, windows, and sunOS
+            if (machine.communicate.test("uname -s | grep SunOS"))
+              realhostfile = '/etc/inet/hosts'
+              move_cmd = 'mv'
+            elsif (machine.communicate.test("test -d $Env:SystemRoot"))
+              realhostfile = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
+              move_cmd = 'mv -force'
+            else 
+              realhostfile = '/etc/hosts'
+              move_cmd = 'mv'
+            end
+            
+            #Back to my code
+            #Grab Vagrant's temp file location
+            guesthostfilepath = @env.tmp_path.join("hosts."+machine.config.vm.hostname)
+            #Download guest's hosts file
+            machine.communicate.download(realhostfile, guesthostfilepath)
+            
+            #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]  
+              #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)  
+            end
+          end
+          
+          
+            
+        end
+        
+      end       
+    end    
+  end
+end

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

@@ -23,6 +23,11 @@ module VagrantPlugins
             require_relative "multiinit"
             MultiInit
           end
+          
+          @subcommands.register(:hostfile) do
+            require_relative "hostfile"
+            HostFile
+          end
 
         end
 

data/lib/vagrant-flow/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantFlow
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Steve Morin
@@ -54,6 +54,7 @@ files:
 - create_sample_multiinit_input-file.rb
 - lib/vagrant-flow.rb
 - lib/vagrant-flow/command/ansibleinventory.rb
+- lib/vagrant-flow/command/hostfile.rb
 - lib/vagrant-flow/command/multiinit.rb
 - lib/vagrant-flow/command/root.rb
 - lib/vagrant-flow/plugin.rb