vagrant-dotvm 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761d7388cc8c79acef4962bb3612bcdc4d2d703c
-  data.tar.gz: 83c59133a04e3911572ac52be423c53851259543
+  metadata.gz: a3741c33af778361df094226b8ee04095478677e
+  data.tar.gz: 070ffb7649d83eb279de16ef5da589b7fb89b2a3
 SHA512:
-  metadata.gz: 93aa6bf24bdd66d1b7bbfd4fc107447653bc190dbf119f8dbe5c9684c41e33425a29620b1fac336298732ac1725e2f3aa8d677d67aea2ab5785c5974ac3ddcd4
-  data.tar.gz: 3791e5d01a3589572f58e6be652a652937da623558d19a718cc6559c5572ac0f3c4b2683ea37dcd1d2865aecd636324add9855b1b2b41537664448432078f93b
+  metadata.gz: e6d9a977df0c577e91d401bbe766f2672cbc67e53f13843f3448422e28ba1560e4c911e056bf1b4ac4766eabf28ca12dd6fb74bab0d88bcd46a5fc53a3b0ca0d
+  data.tar.gz: be493b14ed0e792ec75182a336a587e6fc50cfa3bf8b5cb7eaddcab6af477d70ab30a5dd4faf5c4a36cc1df206fa4346ef6048c66bb0c31006ffdcf5d1bfa742

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.27.0
+* CFEngine provision
+
 # 0.26.0
 * Do validation of types in config
 * vCPUs and memory options are not passed to VMWare Fusion

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

@@ -3,7 +3,7 @@ module VagrantPlugins
     module Config
       class Machine < AbstractConfig
         attr_accessor :nick
-        attr_accessor :name
+        attr_accessor :hostname # name
         attr_accessor :box
         attr_accessor :memory
         attr_accessor :cpus
@@ -61,6 +61,10 @@ module VagrantPlugins
           )
         end
 
+        def name=(value)
+          @hostname = value
+        end
+
         def usable_port_range=(value)
           m = value.scan(/^(\d+)\.\.(\d+)$/)
           raise "Invalid usable_port_range, it must be in A..B format." if m.length == 0

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

@@ -5,8 +5,8 @@ module VagrantPlugins
         attr_reader :net
         attr_accessor :type
         attr_accessor :ip
-        attr_accessor :mask # netmask
-        attr_accessor :interface
+        attr_accessor :netmask # mask
+        attr_accessor :virtualbox__intnet # interface
         attr_accessor :guest
         attr_accessor :host
         attr_accessor :protocol
@@ -33,8 +33,12 @@ module VagrantPlugins
           @net = nets[value]
         end
 
-        def netmask=(value)
-          @mask = value
+        def mask=(value)
+          @netmask = value
+        end
+
+        def interface=(value)
+          @virtualbox__intnet = value
         end
       end
     end

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

@@ -58,6 +58,23 @@ module VagrantPlugins
         attr_accessor :orchestrations
         attr_accessor :colorize
         attr_accessor :log_level
+        attr_accessor :am_policy_hub
+        attr_accessor :am_policy_hub
+        attr_accessor :extra_agent_args
+        attr_accessor :classes
+        attr_accessor :deb_repo_file
+        attr_accessor :deb_repo_line
+        attr_accessor :files_path
+        attr_accessor :force_bootstrap
+        attr_accessor :install
+        attr_accessor :mode
+        attr_accessor :policy_server_address
+        attr_accessor :repo_gpg_key_url
+        attr_accessor :run_file
+        attr_accessor :upload_path
+        attr_accessor :yum_repo_file
+        attr_accessor :yum_repo_url
+        attr_accessor :package_name
       end
     end
   end

data/lib/vagrant-dotvm/configinjecter.rb

@@ -22,24 +22,15 @@ module VagrantPlugins
           define_opts[:autostart] = machine_cfg.autostart unless machine_cfg.autostart.nil?
 
           vc.vm.define machine_cfg.nick, **define_opts do |machine|
-            machine.vm.box                           = machine_cfg.box                           unless machine_cfg.box.nil?
-            machine.vm.hostname                      = machine_cfg.name                          unless machine_cfg.name.nil?
-            machine.vm.boot_timeout                  = machine_cfg.boot_timeout                  unless machine_cfg.boot_timeout.nil?
-            machine.vm.box_check_update              = machine_cfg.box_check_update              unless machine_cfg.box_check_update.nil?
-            machine.vm.box_version                   = machine_cfg.box_version                   unless machine_cfg.box_version.nil?
-            machine.vm.graceful_halt_timeout         = machine_cfg.graceful_halt_timeout         unless machine_cfg.graceful_halt_timeout.nil?
-            machine.vm.post_up_message               = machine_cfg.post_up_message               unless machine_cfg.post_up_message.nil?
-            machine.vm.box_download_checksum         = machine_cfg.box_download_checksum         unless machine_cfg.box_download_checksum.nil?
-            machine.vm.box_download_checksum_type    = machine_cfg.box_download_checksum_type    unless machine_cfg.box_download_checksum_type.nil?
-            machine.vm.box_download_client_cert      = machine_cfg.box_download_client_cert      unless machine_cfg.box_download_client_cert.nil?
-            machine.vm.box_download_ca_cert          = machine_cfg.box_download_ca_cert          unless machine_cfg.box_download_ca_cert.nil?
-            machine.vm.box_download_ca_path          = machine_cfg.box_download_ca_path          unless machine_cfg.box_download_ca_path.nil?
-            machine.vm.box_download_insecure         = machine_cfg.box_download_insecure         unless machine_cfg.box_download_insecure.nil?
-            machine.vm.box_download_location_trusted = machine_cfg.box_download_location_trusted unless machine_cfg.box_download_location_trusted.nil?
-            machine.vm.box_url                       = machine_cfg.box_url                       unless machine_cfg.box_url.nil?
-            machine.vm.communicator                  = machine_cfg.communicator                  unless machine_cfg.communicator.nil?
-            machine.vm.guest                         = machine_cfg.guest                         unless machine_cfg.guest.nil?
-            machine.vm.usable_port_range             = machine_cfg.usable_port_range             unless machine_cfg.usable_port_range.nil?
+            [
+              :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?
@@ -59,18 +50,14 @@ module VagrantPlugins
 
             machine_cfg.networks.each do |net|
               hash = {}
-              hash[:type]               = net.type         unless net.type.nil?
-              hash[:ip]                 = net.ip           unless net.ip.nil?
-              hash[:netmask]            = net.mask         unless net.mask.nil?
-              hash[:virtualbox__intnet] = net.interface    unless net.interface.nil?
-              hash[:guest]              = net.guest        unless net.guest.nil?
-              hash[:host]               = net.host         unless net.host.nil?
-              hash[:protocol]           = net.protocol     unless net.protocol.nil?
-              hash[:bridge]             = net.bridge       unless net.bridge.nil?
-              hash[:guest_ip]           = net.guest_ip     unless net.guest_ip.nil?
-              hash[:host_ip]            = net.host_ip      unless net.host_ip.nil?
-              hash[:auto_correct]       = net.auto_correct unless net.auto_correct.nil?
-              hash[:auto_config]        = net.auto_config  unless net.auto_config.nil?
+
+              [
+                :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
@@ -102,7 +89,10 @@ module VagrantPlugins
                   :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,
+                  :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,
                 ].each do |opt|
                   val = provision.send(opt)
                   p.send("#{opt}=", val) unless val.nil?
@@ -112,24 +102,15 @@ module VagrantPlugins
 
             machine_cfg.shared_folders.each do |folder|
               hash = {}
-              hash[:disabled]          = folder.disabled          unless folder.disabled.nil?
-              hash[:create]            = folder.create            unless folder.create.nil?
-              hash[:type]              = folder.type              unless folder.type.nil?
-              hash[:group]             = folder.group             unless folder.group.nil?
-              hash[:mount_options]     = folder.mount_options     unless folder.mount_options.nil?
-              hash[:owner]             = folder.owner             unless folder.owner.nil?
-              hash[:nfs_export]        = folder.nfs_export        unless folder.nfs_export.nil?
-              hash[:nfs_udp]           = folder.nfs_udp           unless folder.nfs_udp.nil?
-              hash[:nfs_version]       = folder.nfs_version       unless folder.nfs_version.nil?
-              hash[:rsync__args]       = folder.rsync__args       unless folder.rsync__args.nil?
-              hash[:rsync__auto]       = folder.rsync__auto       unless folder.rsync__auto.nil?
-              hash[:rsync__chown]      = folder.rsync__chown      unless folder.rsync__chown.nil?
-              hash[:rsync__exclude]    = folder.rsync__exclude    unless folder.rsync__exclude.nil?
-              hash[:rsync__rsync_path] = folder.rsync__rsync_path unless folder.rsync__rsync_path.nil?
-              hash[:rsync__verbose]    = folder.rsync__verbose    unless folder.rsync__verbose.nil?
-              hash[:smb_host]          = folder.smb_host          unless folder.smb_host.nil?
-              hash[:smb_password]      = folder.smb_password      unless folder.smb_password.nil?
-              hash[:smb_username]      = folder.smb_username      unless folder.smb_username.nil?
+
+              [
+                :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

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.26.0"
+    VERSION = "0.27.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Krzysztof Magosa