vagrant-dotvm 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e164970c2222cd429e2d409fcc66b89fad715086
-  data.tar.gz: 27f603a71659096bd0e5fca0c413c21b6dcd2efd
+  metadata.gz: a6d538d3645fe69b4fda9fc292f0fdaafb222cbf
+  data.tar.gz: 4c25a64b1472dd6636f6b180872cf381e6751c48
 SHA512:
-  metadata.gz: 4f4d261953cfd446cdf19cc07617c1edadd73978be8e41d218b5cc1bbe7c354a8e017fa38face496dce16a9522321d0f7975eea45bd93f3bfe2f837dd857d3b9
-  data.tar.gz: c2d566546048daf91b47a6161f078f7ab298ea7fa8e0738db614360759ceccd68a70c246d4ec5afa3377bb6d35402aa745f691009bea418a9fdac1ff04c1ad0a
+  metadata.gz: c3e851140912f7c3ad8372dc94477d595d7d578ff42ccefafef1fb7278aa23d0223a919ec63788b850f60b6430e6396c46f0f906227a64ef34d6fa16e1737799
+  data.tar.gz: 202f8824f810364eea87a4a08778c32be19e3c64595445d2dd323b65d6bbaca48b982b3652cb2cd76a0de2491655633cde48ca7a7f7120415c3da3b3a8b36d72

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.30.0
+* Ability to set pillar data
+
 # 0.29.0
 * Chef provision
 

data/lib/vagrant-dotvm.rb

@@ -4,7 +4,15 @@ require 'yaml'
 require 'vagrant-dotvm/plugin'
 require 'vagrant-dotvm/version'
 require 'vagrant-dotvm/dotvm'
-require 'vagrant-dotvm/configinjecter'
+
+require 'vagrant-dotvm/injector/root'
+require 'vagrant-dotvm/injector/machine'
+require 'vagrant-dotvm/injector/provision'
+require 'vagrant-dotvm/injector/authorizedkey'
+require 'vagrant-dotvm/injector/host'
+require 'vagrant-dotvm/injector/sharedfolder'
+require 'vagrant-dotvm/injector/route'
+require 'vagrant-dotvm/injector/network'
 
 require 'vagrant-dotvm/config/abstractconfig'
 require 'vagrant-dotvm/config/root'

data/lib/vagrant-dotvm/config/provision.rb

@@ -121,6 +121,7 @@ module VagrantPlugins
         attr_accessor :recipe
         attr_accessor :recipes # chef
         attr_accessor :roles # chef
+        attr_accessor :pillar
       end
     end
   end

data/lib/vagrant-dotvm/dotvm.rb

@@ -43,10 +43,8 @@ module VagrantPlugins
 
       public
       def inject(vc)
-        configs = get_configs()
-
-        configs.each do |config|
-          ConfigInjecter.inject(config, vc)
+        get_configs.each do |config|
+          Injector::Root.inject config: config, vc: vc
         end
       end
 

data/lib/vagrant-dotvm/injector/authorizedkey.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class AuthorizedKey
+        def self.inject(key: nil, machine: nil)
+          if key.type == "file"
+            pubkey = File.readlines(File.expand_path(key.path)).first.strip
+          elsif key.type == "static"
+            pubkey = key.key
+          end
+
+          machine.vm.provision "shell" do |s|
+            s.path       = File.dirname(__FILE__) + "/../../utils/authorize_key.sh"
+            s.args       = [pubkey]
+            s.privileged = false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/host.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Host
+        def self.inject(host: nil, machine: nil)
+          machine.vm.provision "shell", run: "always" do |s|
+            s.path       = File.dirname(__FILE__) + "/../../utils/add_host.sh"
+            s.args       = [host.ip, host.host]
+            s.privileged = true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/machine.rb

@@ -0,0 +1,96 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Machine
+        BOX_OPTIONS = [
+          :box,
+          :hostname,
+          :boot_timeout,
+          :box_check_update,
+          :box_version,
+          :graceful_halt_timeout,
+          :post_up_message,
+          :box_download_checksum,
+          :box_download_checksum_type,
+          :box_download_client_cert,
+          :box_download_ca_cert,
+          :box_download_ca_path,
+          :box_download_insecure,
+          :box_download_location_trusted,
+          :box_url,
+          :communicator,
+          :guest,
+          :usable_port_range,
+        ]
+
+        def self.inject(machine_cfg: nil, vc: nil)
+          define_opts = {}
+          define_opts[:primary]   = machine_cfg.primary   unless machine_cfg.primary.nil?
+          define_opts[:autostart] = machine_cfg.autostart unless machine_cfg.autostart.nil?
+
+          vc.vm.define machine_cfg.nick, **define_opts do |machine|
+            BOX_OPTIONS.each do |opt|
+              val = machine_cfg.send(opt)
+              machine.vm.send("#{opt}=", val) unless val.nil?
+            end
+
+            machine.vm.provider "virtualbox" do |vb|
+              vb.customize ["modifyvm", :id, "--memory",          machine_cfg.memory] unless machine_cfg.memory.nil?
+              vb.customize ["modifyvm", :id, "--cpus",            machine_cfg.cpus]   unless machine_cfg.cpus.nil?
+              vb.customize ["modifyvm", :id, "--cpuexecutioncap", machine_cfg.cpucap] unless machine_cfg.cpucap.nil?
+              vb.customize ["modifyvm", :id, "--natnet1",         machine_cfg.natnet] unless machine_cfg.natnet.nil?
+
+              machine_cfg.options[:virtualbox].each do |option|
+                vb.customize ["modifyvm", :id, option.name, option.value]
+              end
+            end
+
+            machine.vm.provider "vmware_fusion" do |vf|
+              vf.vmx["memsize"]  = machine_cfg.memory unless machine_cfg.memory.nil?
+              vf.vmz["numvcpus"] = machine_cfg.cpus   unless machine_cfg.cpus.nil?
+            end
+
+            machine_cfg.networks.each do |net|
+              Network.inject net: net,
+                             machine: machine
+            end
+
+            machine_cfg.routes.each do |route|
+              Route.inject route: route,
+                           machine: machine
+            end
+
+            machine_cfg.hosts.each do |host|
+              Host.inject host: host,
+                       machine: machine
+            end
+
+            machine_cfg.provision.each do |provision|
+              Provision.inject provision_cfg: provision,
+                               machine: machine
+            end
+
+            machine_cfg.shared_folders.each do |folder|
+              SharedFolder.inject folder: folder,
+                                  machine: machine
+            end
+
+            machine_cfg.authorized_keys.each do |key|
+              AuthorizedKey.inject key: key,
+                                   machine: machine
+            end
+
+            if Vagrant.has_plugin?("vagrant-group")
+              vc.group.groups = {} unless vc.group.groups.kind_of?(Hash)
+
+              machine_cfg.groups.each do |group|
+                vc.group.groups[group] = [] unless vc.group.groups.has_key?(group)
+                vc.group.groups[group] << machine_cfg.nick
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/network.rb

@@ -0,0 +1,33 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Network
+        OPTIONS = [
+          :type,
+          :ip,
+          :netmask,
+          :virtualbox__intnet,
+          :guest,
+          :host,
+          :protocol,
+          :bridge,
+          :guest_ip,
+          :host_ip,
+          :auto_correct,
+          :auto_config,
+        ]
+
+        def self.inject(net: nil, machine: nil)
+          hash = {}
+
+          OPTIONS.each do |opt|
+            val = net.send(opt)
+            hash[opt] = val unless val.nil?
+          end
+
+          machine.vm.network net.net, **hash
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/provision.rb

@@ -0,0 +1,146 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Provision
+        OPTIONS = [
+          :path,
+          :inline,
+          :args,
+          :privileged,
+          :source,
+          :destination,
+          :module_path,
+          :manifest_file,
+          :manifests_path,
+          :binary_path,
+          :hiera_config_path,
+          :environment,
+          :environment_path,
+          :binary,
+          :upload_path,
+          :keep_color,
+          :name,
+          :powershell_args,
+          :facter,
+          :options,
+          :synced_folder_type,
+          :temp_dir,
+          :working_directory,
+          :client_cert_path,
+          :client_private_key_path,
+          :puppet_node,
+          :puppet_server,
+          :minion_config,
+          :run_highstate,
+          :install_master,
+          :no_minion,
+          :install_syndic,
+          :install_type,
+          :install_args,
+          :install_command,
+          :always_install,
+          :bootstrap_script,
+          :bootstrap_options,
+          :version,
+          :minion_key,
+          :minion_id,
+          :minion_pub,
+          :grains_config,
+          :masterless,
+          :master_config,
+          :master_key,
+          :master_pub,
+          :seed_master,
+          :run_highstate,
+          :run_overstate,
+          :orchestrations,
+          :colorize,
+          :log_level,
+          :am_policy_hub,
+          :extra_agent_args,
+          :classes,
+          :deb_repo_file,
+          :deb_repo_line,
+          :files_path,
+          :force_bootstrap,
+          :install,
+          :mode,
+          :policy_server_address,
+          :repo_gpg_key_url,
+          :run_file,
+          :upload_path,
+          :yum_repo_file,
+          :yum_repo_url,
+          :package_name,
+          :groups,
+          :inventory_path,
+          :playbook,
+          :extra_vars,
+          :sudo,
+          :sudo_user,
+          :ask_sudo_pass,
+          :ask_vault_pass,
+          :vault_password_file,
+          :limit,
+          :verbose,
+          :tags,
+          :skip_tags,
+          :start_at_task,
+          :raw_arguments,
+          :raw_ssh_args,
+          :host_key_checking,
+          :cookbooks_path,
+          :data_bags_path,
+          :environments_path,
+          :recipe_url,
+          :roles_path,
+          :binary_env,
+          :installer_download_path,
+          :prerelease,
+          :arguments,
+          :attempts,
+          :custom_config_path,
+          :encrypted_data_bag_secret_key_path,
+          :formatter,
+          :http_proxy,
+          :http_proxy_user,
+          :http_proxy_pass,
+          :no_proxy,
+          :json,
+          :node_name,
+          :provisioning_path,
+          :run_list,
+          :file_cache_path,
+          :file_backup_path,
+          :verbose_logging,
+          :enable_reporting,
+          :client_key_path,
+          :validation_client_name,
+          :delete_node,
+          :delete_client,
+          :recipe,
+        ]
+
+        public
+        def self.inject(provision_cfg: nil, machine: nil)
+          machine.vm.provision provision_cfg.type, run: provision_cfg.run do |p|
+            OPTIONS.each do |opt|
+              val = provision_cfg.send(opt)
+              p.send("#{opt}=", val) unless val.nil?
+            end
+
+            provision_cfg.recipes.to_a.each do |recipe|
+              p.add_recipe(recipe)
+            end
+
+            provision_cfg.roles.to_a.each do |role|
+              p.add_role(role)
+            end
+
+            p.pillar provision_cfg.pillar unless provision_cfg.pillar.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/root.rb

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Root
+        def self.inject(config: nil, vc: nil)
+          config.options[:ssh].each do |option|
+            vc.ssh.send("#{option.name}=", option.value)
+          end
+
+          config.options[:winrm].each do |option|
+            vc.winrm.send("#{option.name}=", option.value)
+          end
+
+          config.options[:vagrant].each do |option|
+            vc.vagrant.send("#{option.name}=", option.value)
+          end
+
+          config.machines.each do |machine_cfg|
+            Machine.inject machine_cfg: machine_cfg, vc: vc
+          end
+        end
+      end # Root
+    end # Injector
+  end # Dotvm
+end # VagrantPlugins

data/lib/vagrant-dotvm/injector/route.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class Route
+        def self.inject(route: nil, machine: nil)
+          machine.vm.provision "shell", run: "always" do |s|
+            s.path       = File.dirname(__FILE__) + "/../../../utils/setup_route.sh"
+            s.args       = [route.destination, route.gateway]
+            s.privileged = true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/sharedfolder.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class SharedFolder
+        OPTIONS = [
+          :disabled,
+          :create,
+          :type,
+          :group,
+          :mount_options,
+          :owner,
+          :nfs_export,
+          :nfs_udp,
+          :nfs_version,
+          :rsync__args,
+          :rsync__auto,
+          :rsync__chown,
+          :rsync__exclude,
+          :rsync__rsync_path,
+          :rsync__verbose,
+          :smb_host,
+          :smb_password,
+          :smb_username,
+        ]
+
+        def self.inject(folder: nil, machine: nil)
+          hash = {}
+
+          OPTIONS.each do |opt|
+            val = folder.send(opt)
+            hash[opt] = val unless val.nil?
+          end
+
+          machine.vm.synced_folder folder.host, folder.guest, **hash
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.29.0"
+    VERSION = "0.30.0"
   end
 end

data/vagrant-dotvm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Krzysztof Magosa"]
   spec.email         = ["krzysztof@magosa.pl"]
   spec.summary       = "Easy YAML based multi machine config approach for Vagrant."
-  spec.homepage      = "http://github.com/krzysztof-magosa/vagrant-dotvm"
+  spec.homepage      = "http://github.com/vagrant-dotvm/vagrant-dotvm"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,15 +70,22 @@ files:
 - lib/vagrant-dotvm/config/root.rb
 - lib/vagrant-dotvm/config/route.rb
 - lib/vagrant-dotvm/config/sharedfolder.rb
-- lib/vagrant-dotvm/configinjecter.rb
 - lib/vagrant-dotvm/dotvm.rb
+- lib/vagrant-dotvm/injector/authorizedkey.rb
+- lib/vagrant-dotvm/injector/host.rb
+- lib/vagrant-dotvm/injector/machine.rb
+- lib/vagrant-dotvm/injector/network.rb
+- lib/vagrant-dotvm/injector/provision.rb
+- lib/vagrant-dotvm/injector/root.rb
+- lib/vagrant-dotvm/injector/route.rb
+- lib/vagrant-dotvm/injector/sharedfolder.rb
 - lib/vagrant-dotvm/plugin.rb
 - lib/vagrant-dotvm/version.rb
 - utils/add_host.sh
 - utils/authorize_key.sh
 - utils/setup_route.sh
 - vagrant-dotvm.gemspec
-homepage: http://github.com/krzysztof-magosa/vagrant-dotvm
+homepage: http://github.com/vagrant-dotvm/vagrant-dotvm
 licenses:
 - MIT
 metadata: {}

data/lib/vagrant-dotvm/configinjecter.rb

@@ -1,162 +0,0 @@
-module VagrantPlugins
-  module Dotvm
-    class ConfigInjecter
-
-      public
-      def self.inject(config, vc)
-        config.options[:ssh].each do |option|
-          vc.ssh.send("#{option.name}=", option.value)
-        end
-
-        config.options[:winrm].each do |option|
-          vc.winrm.send("#{option.name}=", option.value)
-        end
-
-        config.options[:vagrant].each do |option|
-          vc.vagrant.send("#{option.name}=", option.value)
-        end
-
-        config.machines.each do |machine_cfg|
-          define_opts = {}
-          define_opts[:primary]   = machine_cfg.primary   unless machine_cfg.primary.nil?
-          define_opts[:autostart] = machine_cfg.autostart unless machine_cfg.autostart.nil?
-
-          vc.vm.define machine_cfg.nick, **define_opts do |machine|
-            [
-              :box, :hostname, :boot_timeout, :box_check_update, :box_version, :graceful_halt_timeout, :post_up_message,
-              :box_download_checksum, :box_download_checksum_type, :box_download_client_cert, :box_download_ca_cert,
-              :box_download_ca_path, :box_download_insecure, :box_download_location_trusted, :box_url, :communicator,
-              :guest, :usable_port_range
-            ].each do |opt|
-              val = machine_cfg.send(opt)
-              machine.vm.send("#{opt}=", val) unless val.nil?
-            end
-
-            machine.vm.provider "virtualbox" do |vb|
-              vb.customize ["modifyvm", :id, "--memory",          machine_cfg.memory] unless machine_cfg.memory.nil?
-              vb.customize ["modifyvm", :id, "--cpus",            machine_cfg.cpus]   unless machine_cfg.cpus.nil?
-              vb.customize ["modifyvm", :id, "--cpuexecutioncap", machine_cfg.cpucap] unless machine_cfg.cpucap.nil?
-              vb.customize ["modifyvm", :id, "--natnet1",         machine_cfg.natnet] unless machine_cfg.natnet.nil?
-
-              machine_cfg.options[:virtualbox].each do |option|
-                vb.customize ["modifyvm", :id, option.name, option.value]
-              end
-            end
-
-            machine.vm.provider "vmware_fusion" do |vf|
-              vf.vmx["memsize"]  = machine_cfg.memory unless machine_cfg.memory.nil?
-              vf.vmz["numvcpus"] = machine_cfg.cpus   unless machine_cfg.cpus.nil?
-            end
-
-            machine_cfg.networks.each do |net|
-              hash = {}
-
-              [
-                :type, :ip, :netmask, :virtualbox__intnet, :guest, :host, :protocol, :bridge,
-                :guest_ip, :host_ip, :auto_correct, :auto_config,
-              ].each do |opt|
-                val = net.send(opt)
-                hash[opt] = val unless val.nil?
-              end
-
-              machine.vm.network net.net, **hash
-            end
-
-            machine_cfg.routes.each do |route|
-              machine.vm.provision "shell", run: "always" do |s|
-                s.path       = File.dirname(__FILE__) + "/../../utils/setup_route.sh"
-                s.args       = [route.destination, route.gateway]
-                s.privileged = true
-              end
-            end
-
-            machine_cfg.hosts.each do |host|
-              machine.vm.provision "shell", run: "always" do |s|
-                s.path       = File.dirname(__FILE__) + "/../../utils/add_host.sh"
-                s.args       = [host.ip, host.host]
-                s.privileged = true
-              end
-            end
-
-            machine_cfg.provision.each do |provision|
-              machine.vm.provision provision.type, run: provision.run do |p|
-                [
-                  :path, :inline, :args, :privileged, :source, :destination, :module_path, :manifest_file,
-                  :manifests_path, :binary_path, :hiera_config_path, :environment, :environment_path,
-                  :binary, :upload_path, :keep_color, :name, :powershell_args, :facter, :options,
-                  :synced_folder_type, :temp_dir, :working_directory, :client_cert_path, :client_private_key_path,
-                  :puppet_node, :puppet_server, :minion_config, :run_highstate, :install_master, :no_minion,
-                  :install_syndic, :install_type, :install_args, :install_command, :always_install, :bootstrap_script,
-                  :bootstrap_options, :version, :minion_key, :minion_id, :minion_pub, :grains_config, :masterless,
-                  :master_config, :master_key, :master_pub, :seed_master, :run_highstate, :run_overstate,
-                  :orchestrations, :colorize, :log_level, :am_policy_hub, :extra_agent_args, :classes,
-                  :deb_repo_file, :deb_repo_line, :files_path, :force_bootstrap, :install, :mode,
-                  :policy_server_address, :repo_gpg_key_url, :run_file, :upload_path, :yum_repo_file,
-                  :yum_repo_url, :package_name, :groups, :inventory_path, :playbook, :extra_vars,
-                  :sudo, :sudo_user, :ask_sudo_pass, :ask_vault_pass, :vault_password_file, :limit,
-                  :verbose, :tags, :skip_tags, :start_at_task, :raw_arguments, :raw_ssh_args, :host_key_checking,
-                  :cookbooks_path, :data_bags_path, :environments_path, :recipe_url, :roles_path, :binary_env,
-                  :installer_download_path, :prerelease, :arguments, :attempts, :custom_config_path,
-                  :encrypted_data_bag_secret_key_path, :formatter, :http_proxy, :http_proxy_user,
-                  :http_proxy_pass, :no_proxy, :json, :node_name, :provisioning_path, :run_list,
-                  :file_cache_path, :file_backup_path, :verbose_logging, :enable_reporting,
-                  :client_key_path, :validation_client_name, :delete_node, :delete_client, :recipe,
-                ].each do |opt|
-                  val = provision.send(opt)
-                  p.send("#{opt}=", val) unless val.nil?
-                end
-
-                provision.recipes.to_a.each do |recipe|
-                  p.add_recipe(recipe)
-                end
-
-                provision.roles.to_a.each do |role|
-                  p.add_role(role)
-                end
-              end
-            end
-
-            machine_cfg.shared_folders.each do |folder|
-              hash = {}
-
-              [
-                :disabled, :create, :type, :group, :mount_options, :owner, :nfs_export, :nfs_udp, :nfs_version,
-                :rsync__args, :rsync__auto, :rsync__chown, :rsync__exclude, :rsync__rsync_path, :rsync__verbose,
-                :smb_host, :smb_password, :smb_username
-              ].each do |opt|
-                val = folder.send(opt)
-                hash[opt] = val unless val.nil?
-              end
-
-              machine.vm.synced_folder folder.host, folder.guest, **hash
-            end
-
-            machine_cfg.authorized_keys.each do |key|
-              if key.type == "file"
-                pubkey = File.readlines(File.expand_path(key.path)).first.strip
-              elsif key.type == "static"
-                pubkey = key.key
-              end
-
-              machine.vm.provision "shell" do |s|
-                s.path       = File.dirname(__FILE__) + "/../../utils/authorize_key.sh"
-                s.args       = [pubkey]
-                s.privileged = false
-              end
-            end
-
-            if Vagrant.has_plugin?("vagrant-group")
-              vc.group.groups = {} unless vc.group.groups.kind_of?(Hash)
-
-              machine_cfg.groups.each do |group|
-                vc.group.groups[group] = [] unless vc.group.groups.has_key?(group)
-                vc.group.groups[group] << machine_cfg.nick
-              end
-            end
-          end
-        end
-      end
-
-    end # ConfigInjecter
-  end # Dotvm
-end # VagrantPlugins