zergrush_vagrant 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dd98a5c71a254b0c02f3826f144f510891feada
-  data.tar.gz: facd3cf108c86b6ca007812562f7ebe86e99fdd8
+  metadata.gz: 613db97e270ed84ab042953b3e2b0b9f190eee07
+  data.tar.gz: a31d61d4a70873d6661a8499d95bd6035951ac11
 SHA512:
-  metadata.gz: 0049d7c9350f748c4065418a52be9a81f27f26935ef57d4eeef13a46b49e3c554f82e1dc8e0de2ae1a0a577997db5f7651376b1080cca8825559cc3a438a317b
-  data.tar.gz: 113adfdbfd8c0873f1c6b6e9e75ec638d9d3e624ba2d58ebe00a3970ef5c791a85114914e0fa3b8a867d01ab860b706e86bdb21dbfa3536c21c1cf46042a785e
+  metadata.gz: 0cb6d4938d637ecd4f2eea9eea1193b9337eca37f838fe0483b12a647ea515c870f3b0f8f92d1ed5c7e25c855742bf77aadfdff8b06cf7b437f240eaf8601894
+  data.tar.gz: e80ee37bbdb5552b8d9939a3a662e93c93faf3a26c441a620546e619d68c5110d2c829dec944512d649b75ad8de14beef9b7fcddaae2f3dc8e5d44551011a704

data/README.md

@@ -1,17 +1,113 @@
-zergrush_vagrant GemPlugin
+Vagrant driver for Zerg
 ===
 
-Tasks
+Dependencies
 --------------
+
+- [vagrant-aws](https://github.com/mitchellh/vagrant-aws)
+- [vagrant-libvirt](https://github.com/pradels/vagrant-libvirt)
+- [vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus)
+- [vagrant-berkshelf](https://github.com/berkshelf/vagrant-berkshelf)
+
+Additional properties defined
+--------------
+
+######[Synchronized folders](resources/folder_schema.template)
+
+Defined by [Vagrant synced folders](http://docs.vagrantup.com/v2/synced-folders/)
+
+Example use:
+```
+...
+"create": true,
+"mount_options": ["rw", "vers=3", "tcp"]
+...
+```
+
+######[Networks](resources/networks_schema.template)
+
+Defined by [Vagrant networking](http://docs.vagrantup.com/v2/networking/index.html)
+
+Example use:
+```
+...
+"type": "public_network",
+"bridge": "en1: Wi-Fi (AirPort)"
+...
+```
+
+######[Driver options](resources/option_schema.template)
+
+- providertype - One of the supported Vagrant providers. Currenlty supported providers are: virtualbox, libvirt, aws
+- provider_options - hash of provider specific options. 
+- raw_options - if some of the provider options do not map to a hash format - you can specify them as an array of strings. Each string should start with '[provider].'
+
+Example use:
+```
+...
+"driver": {
+    "drivertype": "vagrant",
+    "driveroptions": [
+        {
+            "providertype": "aws",
+            "provider_options" : {
+                "instance_type": "t1.micro",
+                "access_key_id": "blah blah blah",
+                "secret_access_key": "yadda yadda",
+                "keypair_name": "HURGHBURGHLGHRL",
+                "ami": "ami-3fec7956",
+                "region": "us-east-1"
+            }
+        },
+        {
+            "providertype": "virtualbox",
+            "provider_options" : {
+                "gui": false,
+                "memory": 256
+            },
+            "raw_options": [
+                "virtualbox.customize [\"modifyvm\", :id,  \"--natdnsproxy1\", \"off\"]",
+                "virtualbox.customize [\"modifyvm\", :id,  \"--natdnshostresolver1\", \"off\"]"
+            ]
+        }
+    ]
+}
+...
+```
+
+######[Forwarded ports](resources/ports_schema.template)
+
+Defined by [Vagrant forwarded ports](http://docs.vagrantup.com/v2/networking/forwarded_ports.html)
+
+Example use:
+```
+...
+"guest_port": 8080,
+"host_port": 80,
+"protocol": "tcp"
+...
+```
+
+######[SSH](resources/ssh_schema.template)
+
+Defined by [Vagrant SSH](http://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html)
+
+Example use:
+```
+...
+"username": "ubuntu",
+"private_key_path": "PATH_TO_YOUR_PK",
+"shell": "bash -l"
+...
+```
+
+######[Tasks](resources/tasks_schema.template)
+
+Describes what tasks a VM should run at provisioning step
+
 - type - Type of task payload. 'shell', 'chef_client' or 'chef_solo'
-    - shell task parameters: 
-        - [shell provisioner]
+    - shell task parameters are defined by [Vagrant shell provisioner](http://docs.vagrantup.com/v2/provisioning/shell.html)
     - chef_client and chef_solo task parameters map directly to Vagrant provisioner docs, **EXCEPT the node_name parameter**:
-        - [chef_solo provisioner]
-        - [chef_client provisioner]
-        - [chef common options]
-
-[chef_solo provisioner]:http://docs.vagrantup.com/v2/provisioning/chef_solo.html
-[chef_client provisioner]:https://docs.vagrantup.com/v2/provisioning/chef_client.html
-[chef common options]:http://docs.vagrantup.com/v2/provisioning/chef_common.html
-[shell provisioner]:http://docs.vagrantup.com/v2/provisioning/shell.html
+        - [chef_solo provisioner](http://docs.vagrantup.com/v2/provisioning/chef_solo.html)
+        - [chef_client provisioner](https://docs.vagrantup.com/v2/provisioning/chef_client.html)
+        - [chef common options](http://docs.vagrantup.com/v2/provisioning/chef_common.html)

data/lib/zergrush_vagrant/init.rb

@@ -22,12 +22,13 @@
 #++
 
 require 'zerg'
+require 'rbconfig'
 require_relative 'renderer'
 
 # give this class the name you want for your command zergrush_vagrant
 class Vagrant < ZergGemPlugin::Plugin "/driver"
     def rush hive_location, task_name, task_hash, debug
-        abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+        check_dependencies
         puts ("Will perform task #{task_name} with contents:\n #{task_hash.ai}")
 
         renderer = Renderer.new(
@@ -38,13 +39,20 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
 
         debug_string = (debug == true) ? " --debug" : ""                
 
+        # last explicitly defined driver option set
+        last_defined_driveroption = nil
+
         # bring up all of the VMs first.
         puts("Starting vagrant in #{File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name)}")
-        for index in 0..task_hash["instances"] - 1
+        for index in 0..task_hash["num_instances"] - 1
+
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (task_hash["vm"]["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : task_hash["vm"]["driver"]["driveroptions"][index]
+
             create_pid = Process.spawn(
                 {
                     "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name),
-                    "VAGRANT_DEFAULT_PROVIDER" => task_hash["vm"]["driver"]["providertype"]
+                    "VAGRANT_DEFAULT_PROVIDER" => last_defined_driveroption["providertype"]
                 },
                 "vagrant up zergling_#{index} --no-provision#{debug_string}")
             Process.wait(create_pid)
@@ -56,15 +64,19 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
             end
         end
 
+        last_defined_driveroption = nil
         puts("Running tasks in vagrant virtual machines...")
         # and provision them all at once (sort of)
         provisioners = Array.new
         provision_pid = nil
-        for index in 0..task_hash["instances"] - 1
+        for index in 0..task_hash["num_instances"] - 1
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (task_hash["vm"]["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : task_hash["vm"]["driver"]["driveroptions"][index]
+
             provision_pid = Process.spawn(
                 {
                     "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name),
-                    "VAGRANT_DEFAULT_PROVIDER" => task_hash["vm"]["driver"]["providertype"]
+                    "VAGRANT_DEFAULT_PROVIDER" => last_defined_driveroption["providertype"]
                 },
                 "vagrant provision zergling_#{index}#{debug_string}")
             provisioners.push({:name => "zergling_#{index}", :pid => provision_pid})
@@ -82,17 +94,40 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
             }.join 
         }
 
-        if task_hash["vm"]["keepalive"] == false
-            halt(hive_location, task_name, task_hash, debug)
-        else
-            puts "Will leave instances running."
-        end
+        # halt only the machines that are not marked as "keepalive"
+        last_defined_driveroption = nil
+        last_defined_vm = nil
 
+        halt_pid = nil
+        keepalive_left = false
+        for index in 0..task_hash["num_instances"] - 1
+
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (task_hash["vm"]["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : task_hash["vm"]["driver"]["driveroptions"][index]
+            
+            # grab last defined vm instance, or keep the current one
+            last_defined_vm = (task_hash["vm"]["instances"][index] == nil) ? last_defined_vm : task_hash["vm"]["instances"][index]
+            
+            if last_defined_vm["keepalive"] != true
+                halt_pid = Process.spawn(
+                    {
+                        "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name),
+                        "VAGRANT_DEFAULT_PROVIDER" => last_defined_driveroption["providertype"]
+                    },
+                    "vagrant halt zergling_#{index}#{debug_string}")
+                Process.wait(halt_pid)
+                abort("ERROR: vagrant halt failed on machine zergling_#{index}!") unless $?.exitstatus == 0
+            else
+                keepalive_left = true
+                puts "zergling_#{index} is marked as keepalive, skipping halt..."
+            end
+        end
         abort("ERROR: Finished with errors in: #{errors.to_s}") unless errors.length == 0
+        puts "Some instances were left running." unless keepalive_left == false
     end
 
     def clean hive_location, task_name, task_hash, debug
-        abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+        check_dependencies
         puts("Cleaning task #{task_name} ...")
 
         renderer = Renderer.new(
@@ -104,27 +139,47 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
         # run vagrant cleanup
         debug_string = (debug == true) ? " --debug" : ""
         
-        for index in 0..task_hash["instances"] - 1
+        last_defined_driveroption = nil
+
+        for index in 0..task_hash["num_instances"] - 1
+
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (task_hash["vm"]["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : task_hash["vm"]["driver"]["driveroptions"][index]
+
             cleanup_pid = Process.spawn(
                 {
                     "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name),
-                    "VAGRANT_DEFAULT_PROVIDER" => task_hash["vm"]["driver"]["providertype"]
+                    "VAGRANT_DEFAULT_PROVIDER" => last_defined_driveroption["providertype"]
                 },
                 "vagrant destroy zergling_#{index} --force#{debug_string}")
             Process.wait(cleanup_pid)
             abort("ERROR: vagrant failed!") unless $?.exitstatus == 0
         end
 
-        cleanup_pid = Process.spawn(
-            {
-                "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name)
-            },
-            "vagrant box remove zergling_#{task_name}_#{task_hash["vm"]["driver"]["providertype"]}#{debug_string} #{task_hash["vm"]["driver"]["providertype"]}")
-        Process.wait(cleanup_pid)
+        last_defined_driveroption = nil
+        
+        # last explicitly defined vm instance. 
+        last_defined_vm = nil
+
+        for index in 0..task_hash["num_instances"] - 1
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (task_hash["vm"]["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : task_hash["vm"]["driver"]["driveroptions"][index]
+
+            # grab last defined vm instance, or keep the current one
+            last_defined_vm = (task_hash["vm"]["instances"][index] == nil) ? last_defined_vm : task_hash["vm"]["instances"][index]
+            
+            boxname = Digest::SHA1.hexdigest "#{task_name}#{last_defined_driveroption["providertype"]}#{last_defined_vm["basebox"]}"
+            cleanup_pid = Process.spawn(
+                {
+                    "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name)
+                },
+                "vagrant box remove #{boxname} #{last_defined_driveroption["providertype"]}#{debug_string}")
+            Process.wait(cleanup_pid)
+        end
     end
 
     def halt hive_location, task_name, task_hash, debug
-        abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+        check_dependencies
         puts("Halting all vagrant virtual machines for task #{task_name} ...")
         
         renderer = Renderer.new(
@@ -137,11 +192,18 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
 
         # halt all machines
         halt_pid = nil
-        for index in 0..task_hash["instances"] - 1
+
+        last_defined_driveroption = nil
+
+        for index in 0..task_hash["num_instances"] - 1
+
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (task_hash["vm"]["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : task_hash["vm"]["driver"]["driveroptions"][index]
+            
             halt_pid = Process.spawn(
                 {
                     "VAGRANT_CWD" => File.join("#{hive_location}", "driver", task_hash["vm"]["driver"]["drivertype"], task_name),
-                    "VAGRANT_DEFAULT_PROVIDER" => task_hash["vm"]["driver"]["providertype"]
+                    "VAGRANT_DEFAULT_PROVIDER" => last_defined_driveroption["providertype"]
                 },
                 "vagrant halt zergling_#{index}#{debug_string}")
             Process.wait(halt_pid)
@@ -153,6 +215,22 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
         return File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "tasks_schema.template"), 'r').read
     end
 
+    def option_schema
+        return File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "option_schema.template"), 'r').read
+    end
+
+    def folder_schema
+        return File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "folders_schema.template"), 'r').read
+    end
+
+    def port_schema
+        return File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "ports_schema.template"), 'r').read
+    end
+
+    def ssh_schema
+        return File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "ssh_schema.template"), 'r').read
+    end
+
     def which(cmd)
         exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
         ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
@@ -163,5 +241,25 @@ class Vagrant < ZergGemPlugin::Plugin "/driver"
         end
       return nil
     end
+
+    def check_dependencies
+        abort("ERROR: Vagrant not installed!") unless which("vagrant") != nil
+        required_plugins = ["vagrant-aws", "vagrant-omnibus", "vagrant-berkshelf"]
+        if /linux|arch/i === RbConfig::CONFIG['host_os']
+            required_plugins.push("vagrant-libvirt")
+        end
+
+        required_plugins.each { |plugin|
+            plugin_check_pid = Process.spawn("vagrant plugin list | grep #{plugin}")
+            Process.wait(plugin_check_pid)
+
+            if $?.exitstatus != 0
+                puts "Installing #{plugin}"
+                plugin_check_pid = Process.spawn("vagrant plugin install #{plugin}")
+                Process.wait(plugin_check_pid)
+                abort("ERROR: #{plugin} installation failed!") unless $?.exitstatus == 0
+            end
+        }
+    end
 end
 

data/lib/zergrush_vagrant/renderer.rb

@@ -24,24 +24,18 @@
 require 'awesome_print'
 require 'fileutils'
 require 'securerandom'
+require 'ipaddress'
+require 'digest/sha1'
+require 'ipaddress'
 require_relative 'erbalize'
 
 class Renderer
 
-    # generate a virtualbox - compatible MAC address
-    def generateMACAddress()
-        firstChar = (0..255).map(&:chr).select{|x| x =~ /[0-9A-Fa-f]/}.sample(1).join
-        secondChar = (0..255).map(&:chr).select{|x| x =~ /[02468ACEace]/}.sample(1).join
-        restOfChars = (0..255).map(&:chr).select{|x| x =~ /[0-9A-Fa-f]/}.sample(10).join
-        return "#{firstChar}#{secondChar}#{restOfChars}"
-    end
-
     def initialize(hive_location, task_name, task_hash)
         @vm = task_hash["vm"]
         @name = task_name
-        @instances = task_hash["instances"]
-        @tasks = task_hash["tasks"]
-        @synced_folders = task_hash["synced_folders"]
+        @num_instances = task_hash["num_instances"]
+        @vm_instances = task_hash["vm"]["instances"]
         @hive_location = hive_location
     end
 
@@ -57,103 +51,220 @@ class Renderer
         # load the machine details template
         machine_template = File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "machine.template"), 'r').read
 
-        # load the bridge details template
-        bridge_template = File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "bridging.template"), 'r').read
-
-        # load the host only network details template
-        hostonly_template = File.open(File.join("#{File.dirname(__FILE__)}", "..", "..", "resources", "hostonly.template"), 'r').read
 
         # render templates....
-        # render provider details to string
-        # 
-        # render provider details into a string
-        provider_details_array = @vm["driver"]["provider_options"]
-        provider_details = ""
-        for index in 0..provider_details_array.length - 1
-            provider_details += "\t\t" + provider_details_array[index] + "\n"
+
+        # all machines
+        all_machines = ""
+
+        # JSON - defined range of ip addresses in CIDR format
+        ip_range = (@vm.has_key?("private_ip_range")) ? IPAddress(@vm["private_ip_range"]).hosts : nil
+        if ip_range != nil
+            abort("ERROR: ip range (#{@vm["private_ip_range"]}) does not have enough ip addresses for all instances.") unless ip_range.length > @num_instances
         end
 
-        # render provider parent
-        sources =  {
-            :provider => @vm["driver"]["providertype"],
-            :provider_specifics => provider_details
-        }
-        provider_parent_string = Erbalize.erbalize_hash(provider_parent_template, sources)
+        # last explicitly defined vm instance. 
+        last_defined_vm = nil
 
-        # render machine template
-        all_macs = Array.new
-        all_machines = ""
-        for index in 0..@instances - 1
+        # last explicitly defined driver option set
+        last_defined_driveroption = nil
 
-            # last ip octet offset for host only networking
-            ip_octet_offset = index
+        # render a machine section for each instance.
+        # each machine gets an explicitly defined instance
+        # if there is no explicitly defined instance - last known explicitly defined instance information is used.
+        # For example: if num_instances = 3 and there are 2 vm instances defined, then machine_0 gets instance definition 0, machine_1 gets instance 
+        # definition 1, machine_2 gets instance definition 2
+        for index in 0..@num_instances - 1
 
-            # inject randomized node_name into chef_client tasks
-            @tasks.each { |task| 
-                if task["type"] == "chef_client"
-                    task["node_name"] = "zergling_#{index}_#{SecureRandom.hex(20)}"
+            # grab last defined vm instance, or keep the current one
+            last_defined_vm = (@vm_instances[index] == nil) ? last_defined_vm : @vm_instances[index]
+
+            # grab last defined driver options set, or keep the current one
+            last_defined_driveroption = (@vm["driver"]["driveroptions"][index] == nil) ? last_defined_driveroption : @vm["driver"]["driveroptions"][index]
+
+            # provider type
+            provider = last_defined_driveroption["providertype"]
+
+            # unique name
+            unique_name = "zergling_#{index}_#{SecureRandom.hex(20)}"
+
+            # render provider details to string
+            provider_specifics = ""
+
+            if provider == "aws"
+                # inject private ip for aws provider (if not specified explicitly and if ip range is provided)
+                if last_defined_driveroption.has_key?("provider_options")
+                    if last_defined_driveroption["provider_options"].has_key?("subnet_id")
+                        if !last_defined_driveroption["provider_options"].has_key?("private_ip_address")
+                            if ip_range != nil
+                                provider_specifics += "\t\t\t#{provider}.private_ip_address = #{ip_range[index]}"
+                            end
+                        end
+                    end
                 end
-            }
 
-            # tasks array rendered to ruby string. double encoding to escape quotes and allow for variable expansion
-            tasks_array = @tasks.to_json.to_json
-
-            # do we need the bridging template as well?
-            bridge_section = nil
-            if @vm.has_key?("bridge_description")
-                # mac address to use?
-                new_mac = ""
-                begin
-                    new_mac = generateMACAddress()
-                end while all_macs.include? new_mac
-
-                sources = {
-                    :machine_mac => new_mac,
-                    :bridged_eth_description => @vm["bridge_description"]
+                # inject name tag
+                if last_defined_driveroption.has_key?("provider_options")
+                    if last_defined_driveroption["provider_options"].has_key?("tags")
+                        if !last_defined_driveroption["provider_options"]["tags"].has_key?("Name")
+                            last_defined_driveroption["provider_options"]["tags"]["Name"] = unique_name
+                        end
+                    else
+                        last_defined_driveroption["provider_options"]["tags"] = { "Name" => unique_name } 
+                    end
+                end
+
+            end
+
+            if last_defined_driveroption.has_key?("provider_options")
+                provider_options = last_defined_driveroption["provider_options"]
+                
+                provider_options.each do |key, value|
+                    if value.is_a?(String)
+                        provider_specifics += "\t\t\t#{provider}.#{key} = \"#{value}\"\n"
+                    elsif value.is_a?(Array)
+                        provider_specifics += "\t\t\t#{provider}.#{key} = #{value.to_json}\n"
+                    else
+                        provider_specifics += "\t\t\t#{provider}.#{key} = #{value}\n" 
+                    end
+                end
+            end
+
+            if last_defined_driveroption.has_key?("raw_options")
+                raw_provider_options = last_defined_driveroption["raw_options"]    
+                raw_provider_options.each { |raw_option|
+                    provider_specifics += "\t\t\t#{raw_option}\n"
+                }
+            end
+
+            # render networks
+            network_specifics = ""
+            if last_defined_vm.has_key?("networks")
+                last_defined_vm["networks"].each { |network|
+                    network_specifics += "\t\tzergling_#{index}.vm.network \"#{network["type"]}\""
+                    if network.has_key?("bridge")
+                        network_specifics += ", bridge: \"#{network["bridge"]}\""
+                    end
+                    if network.has_key?("ip")
+                        network_specifics += ", ip: \"#{network["ip"]}\""
+                    elsif ip_range != nil && network["type"] != "public_network"
+                        # first host IP is the host machine
+                        network_specifics += ", ip: \"#{ip_range[index + 1]}\""
+                    end                        
+
+                    if network.has_key?("additional")
+                        network["additional"].each do |key, value|
+                            if value.is_a?(String)
+                                network_specifics += ", #{key}: \"#{value}\""
+                            else
+                                network_specifics += ", #{key}: #{value}" 
+                            end
+                        end
+                    end
+                    network_specifics += "\n"
                 }
-                bridge_section = Erbalize.erbalize_hash(bridge_template, sources)
             end
 
-            # do we need the host only template as well?
-            hostonly_section = nil
-            if @vm["private_network"] == true
-                sources = {
-                    :machine_name => "zergling_#{index}",
-                    :last_octet => ip_octet_offset + 4, # TODO: this is probably specific to virtualbox networking
+            # render sync folders
+            folder_specifics = ""
+            if last_defined_vm.has_key?("synced_folders")
+                last_defined_vm["synced_folders"].each { |folder| 
+                    folder_specifics += "\t\tzergling_#{index}.vm.synced_folder \"#{folder["host_path"]}\", \"#{folder["guest_path"]}\""
+                    if folder.has_key?("additional")
+                        folder["additional"].each do |key, value|
+                            if value.is_a?(String)
+                                folder_specifics += ", #{key}: \"#{value}\""
+                            else
+                                folder_specifics += ", #{key}: #{value}" 
+                            end
+                        end 
+                    end
+                    folder_specifics += "\n"
                 }
-                hostonly_section = Erbalize.erbalize_hash(hostonly_template, sources)
             end
 
-            # synced folders
-            folder_definitions = nil
-            if @synced_folders != nil
-                folder_definitions = ""
-                @synced_folders.each { |folder| 
-                    other_options = ""
-                    if folder.has_key?("options")
-                        folder["options"].each { |option|
+            # render forwarded ports
+            port_specifics = ""
+            if last_defined_vm.has_key?("forwarded_ports")
+                last_defined_vm["forwarded_ports"].each { |port| 
+                    port_specifics += "\t\tzergling_#{index}.vm.network \"forwarded_port\", guest: #{port["guest_port"]}, host: #{port["host_port"]}"
+                    if port.has_key?("additional")
+                        port["additional"].each { |option|
                             option.each do |key, value|
                                 if value.is_a?(String)
-                                    other_options += ", :#{key} => \"#{value}\""
+                                    port_specifics += ", #{key}: \"#{value}\""
                                 else
-                                    other_options += ", :#{key} => #{value}" 
+                                    port_specifics += ", #{key}: #{value}" 
                                 end
                             end
                         } 
                     end
-
-                    folder_definition = "zergling_#{index}.vm.synced_folder \"#{folder['host_path']}\", \"#{folder['guest_path']}\""
-                    folder_definition = "#{folder_definition}#{other_options}" unless other_options.empty?()
-                    folder_definitions += "\t\t#{folder_definition}\n"
+                    port_specifics += "\n"
                 }
             end
 
+            # render ssh settings
+            ssh_specifics = ""
+            if last_defined_vm.has_key?("ssh")
+                if last_defined_vm["ssh"].has_key?("username")
+                    ssh_specifics += "\t\tzergling_#{index}.ssh.username = \"#{last_defined_vm["ssh"]["username"]}\"\n"
+                end
+
+                if last_defined_vm["ssh"].has_key?("host")
+                    ssh_specifics += "\t\tzergling_#{index}.ssh.host = \"#{last_defined_vm["ssh"]["host"]}\"\n"
+                end
+
+                if last_defined_vm["ssh"].has_key?("port")
+                    ssh_specifics += "\t\tzergling_#{index}.ssh.port = #{last_defined_vm["ssh"]["port"]}\n"
+                end
+
+                if last_defined_vm["ssh"].has_key?("guest_port")
+                    ssh_specifics += "\t\tzergling_#{index}.ssh.guest_port = #{last_defined_vm["ssh"]["guest_port"]}\n"
+                end
+
+                if last_defined_vm["ssh"].has_key?("private_key_path")
+                    ssh_specifics += "\t\tzergling_#{index}.ssh.private_key_path = \"#{last_defined_vm["ssh"]["private_key_path"]}\"\n"
+                end
+
+                if last_defined_vm["ssh"].has_key?("forward_agent")
+                    ssh_specifics += "\t\tzergling_#{index}.ssh.forward_agent = #{last_defined_vm["ssh"]["forward_agent"]}\n"
+                end
+                     
+                if last_defined_vm["ssh"].has_key?("additional")
+                    last_defined_vm["ssh"]["additional"].each { |option|
+                        option.each do |key, value|
+                            if value.is_a?(String)
+                                ssh_specifics += "\t\tzergling_#{index}.ssh.#{key} = \"#{value}\"\n"
+                            else
+                                ssh_specifics += "\t\tzergling_#{index}.ssh.#{key} = #{value}\n" 
+                            end
+                        end
+                    } 
+                end
+            end
+
+            # render tasks array
+            # inject randomized node_name into chef_client tasks
+            last_defined_vm["tasks"].each { |task| 
+                if task["type"] == "chef_client"
+                    task["node_name"] = unique_name
+                end
+            }
+
+            # tasks array rendered to ruby string. double encoding to escape quotes and allow for variable expansion
+            tasks_array = last_defined_vm["tasks"].to_json.to_json
+
             sources = {
                 :machine_name => "zergling_#{index}",
-                :bridge_specifics => bridge_section,
-                :hostonly_specifics => hostonly_section,
-                :tasks_array => tasks_array,
-                :sync_folders_array => folder_definitions 
+                :basebox_path => last_defined_vm["basebox"],
+                :box_name => Digest::SHA1.hexdigest("#{@name}#{provider}#{last_defined_vm["basebox"]}"),
+                :provider => provider,
+                :provider_specifics => provider_specifics,
+                :networks_array => network_specifics,
+                :sync_folders_array => folder_specifics,
+                :ports_array => port_specifics,
+                :ssh_specifics => ssh_specifics,
+                :tasks_array => tasks_array
             }.delete_if { |k, v| v.nil? }
 
             machine_section = Erbalize.erbalize_hash(machine_template, sources)
@@ -161,9 +272,6 @@ class Renderer
         end
 
         sources = {
-            :provider_section => provider_parent_string,
-            :basebox_path => @vm["basebox"],
-            :box_name => "zergling_#{@name}_#{@vm["driver"]["providertype"]}",
             :vm_defines => all_machines
         }
         full_template = Erbalize.erbalize_hash(main_template, sources)

data/lib/zergrush_vagrant/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module ZergrushVagrant
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/resources/folders_schema.template

@@ -0,0 +1,18 @@
+"create": {
+  "type": "boolean"
+},
+"disabled": {
+  "type": "boolean"
+},
+"group": {
+  "type": "string"
+},
+"mount_options": {
+  "type": "array"
+},
+"owner": {
+  "type": "string"
+},
+"type": {
+  "type": "string"
+}

data/resources/machine.template

@@ -1,8 +1,17 @@
     # define the machine name
     config.vm.define "<%= machine_name %>" do |<%= machine_name %>|
-    <%= bridge_specifics -%>
-    <%= hostonly_specifics %>
+        <%= machine_name %>.vm.box_url = "<%= basebox_path %>"
+        <%= machine_name %>.vm.box = "<%= box_name %>"
+        
+<%= ssh_specifics -%>
+
+        <%= machine_name %>.vm.provider :<%= provider %> do |<%= provider %>|
+<%= provider_specifics -%>
+        end
+
+<%= networks_array -%>
 <%= sync_folders_array -%>
+<%= ports_array -%>
 
         # provisioning
         tasks = JSON.parse(<%= tasks_array %>)

data/resources/main.template

@@ -1,9 +1,5 @@
 Vagrant.configure(2) do |config|    
-<%= provider_section %>
-
     config.vagrant.host = :detect
-    config.vm.box_url = "<%= basebox_path %>"
-    config.vm.box = "<%= box_name %>"
     config.vm.boot_timeout = 300
     config.vm.graceful_halt_timeout = 60    
 <%= vm_defines -%>

data/resources/networks_schema.template

@@ -0,0 +1,12 @@
+"type": {
+  "type": "string"
+},
+"bridge": {
+  "type": "string"
+},
+"ip": {
+  "type": "string"
+},
+"additonal": {
+  "type": "object"
+}

data/resources/option_schema.template

@@ -0,0 +1,9 @@
+"providertype": {
+"type": "string"
+},
+"provider_options": {
+"type": "object"
+},
+"raw_options": {
+"type": "array"
+}

data/resources/ports_schema.template

@@ -0,0 +1,12 @@
+"guest_ip": {
+  "type": "string"
+},
+"host_ip": {
+  "type": "string"
+},
+"protocol": {
+  "type": "string"
+},
+"autocorrect": {
+  "type": "boolean"
+}

data/resources/ssh_schema.template

@@ -0,0 +1,6 @@
+"forward_x11": {
+  "type": "boolean"
+},
+"shell": {
+  "type": "string"
+}

data/resources/tasks_schema.template

@@ -1,174 +1,172 @@
-"properties": {
-          "type": {
-            "type": "string",
-            "pattern": "^(shell|chef_client|chef_solo)$"
-          },
-          "inline": {
-            "type": "string"
-          },
-          "path": {
-            "type": "string"
-          },
-          "parameters": {
-            "type": "string"
-          },
-          "environment": {
-            "type": "string"
-          },
-          "upload_path": {
-            "type": "string"
-          },
-          "recipe_url": {
-            "type": "string"
-          },
-          "client_key_path": {
-            "type": "string"
-          },
-          "validation_client_name": {
-            "type": "string"
-          },
-          "arguments": {
-            "type": "string"
-          },
-          "chef_server_url": {
-            "type": "string"
-          },
-          "validation_key_path": {
-            "type": "string"
-          },
-          "encrypted_data_bag_secret_key_path": {
-            "type": "string"
-          },
-          "binary_path": {
-            "type": "string"
-          },
-          "custom_config_path": {
-            "type": "string"
-          },
-          "formatter": {
-            "type": "string"
-          },
-          "http_proxy": {
-            "type": "string"
-          },
-          "http_proxy_user": {
-            "type": "string"
-          },
-          "http_proxy_pass": {
-            "type": "string"
-          },
-          "no_proxy": {
-            "type": "string"
-          },
-          "https_proxy": {
-            "type": "string"
-          },
-          "https_proxy_user": {
-            "type": "string"
-          },
-          "https_proxy_pass": {
-            "type": "string"
-          },
-          "log_level": {
-            "type": "string"
-          },
-          "provisioning_path": {
-            "type": "string"
-          },
-          "file_cache_path": {
-            "type": "string"
-          },
-          "file_backup_path": {
-            "type": "string"
-          },
-          "verbose_logging": {
-            "type": "boolean"
-          },
-          "delete_node": {
-            "type": "boolean"
-          },
-          "delete_client": {
-            "type": "boolean"
-          },
-          "nfs": {
-            "type": "boolean"
-          },
-          "binary": {
-            "type": "boolean"
-          },
-          "keep_color": {
-            "type": "boolean"
-          },
-          "priveleged": {
-            "type": "boolean"
-          },
-          "attempts": {
-            "type": "integer"
-          },
-          "json": {
-            "type": "object"
-          },
-          "cookbooks_path": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "args": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "roles_path": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "data_bags_path": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "environments_path": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "run_list": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "roles": {
-            "type": "array",
-            "minItems": 1,
-            "items": [
-              {
-                "type": "string"
-              }
-            ]
-          }
-        }
+"type": {
+  "type": "string",
+  "pattern": "^(shell|chef_client|chef_solo)$"
+},
+"inline": {
+  "type": "string"
+},
+"path": {
+  "type": "string"
+},
+"parameters": {
+  "type": "string"
+},
+"environment": {
+  "type": "string"
+},
+"upload_path": {
+  "type": "string"
+},
+"recipe_url": {
+  "type": "string"
+},
+"client_key_path": {
+  "type": "string"
+},
+"validation_client_name": {
+  "type": "string"
+},
+"arguments": {
+  "type": "string"
+},
+"chef_server_url": {
+  "type": "string"
+},
+"validation_key_path": {
+  "type": "string"
+},
+"encrypted_data_bag_secret_key_path": {
+  "type": "string"
+},
+"binary_path": {
+  "type": "string"
+},
+"custom_config_path": {
+  "type": "string"
+},
+"formatter": {
+  "type": "string"
+},
+"http_proxy": {
+  "type": "string"
+},
+"http_proxy_user": {
+  "type": "string"
+},
+"http_proxy_pass": {
+  "type": "string"
+},
+"no_proxy": {
+  "type": "string"
+},
+"https_proxy": {
+  "type": "string"
+},
+"https_proxy_user": {
+  "type": "string"
+},
+"https_proxy_pass": {
+  "type": "string"
+},
+"log_level": {
+  "type": "string"
+},
+"provisioning_path": {
+  "type": "string"
+},
+"file_cache_path": {
+  "type": "string"
+},
+"file_backup_path": {
+  "type": "string"
+},
+"verbose_logging": {
+  "type": "boolean"
+},
+"delete_node": {
+  "type": "boolean"
+},
+"delete_client": {
+  "type": "boolean"
+},
+"nfs": {
+  "type": "boolean"
+},
+"binary": {
+  "type": "boolean"
+},
+"keep_color": {
+  "type": "boolean"
+},
+"priveleged": {
+  "type": "boolean"
+},
+"attempts": {
+  "type": "integer"
+},
+"json": {
+  "type": "object"
+},
+"cookbooks_path": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+},
+"args": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+},
+"roles_path": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+},
+"data_bags_path": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+},
+"environments_path": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+},
+"run_list": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+},
+"roles": {
+  "type": "array",
+  "minItems": 1,
+  "items": [
+    {
+      "type": "string"
+    }
+  ]
+}

data/zergrush_vagrant.gemspec

@@ -19,9 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "zergrush"
 
-  s.add_dependency "vagrant-omnibus"
-  s.add_dependency "vagrant-aws"
-  s.add_dependency "vagrant-libvirt"
+  s.add_dependency "ipaddress"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zergrush_vagrant
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - MTN Satellite Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,35 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vagrant-omnibus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vagrant-aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vagrant-libvirt
+  name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -110,12 +82,15 @@ files:
 - lib/zergrush_vagrant/init.rb
 - lib/zergrush_vagrant/renderer.rb
 - lib/zergrush_vagrant/version.rb
-- resources/bridging.template
 - resources/defaults.yaml
-- resources/hostonly.template
+- resources/folders_schema.template
 - resources/machine.template
 - resources/main.template
+- resources/networks_schema.template
+- resources/option_schema.template
+- resources/ports_schema.template
 - resources/provider.template
+- resources/ssh_schema.template
 - resources/tasks_schema.template
 - zergrush_vagrant.gemspec
 homepage: https://github.com/MTNSatelliteComm/zerg

data/resources/bridging.template

@@ -1 +0,0 @@
-<%= machine_name %>.vm.network :public_network, :bridge => "<%= bridged_eth_description %>", :mac => <%= machine_mac %>, :use_dhcp_assigned_default_route => true

data/resources/hostonly.template

@@ -1 +0,0 @@
-<%= machine_name %>.vm.network :private_network, ip: "192.168.50.<%= last_octet %>"