vagrant-dotvm 0.20.0 → 0.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/README.md +1 -0
  4. data/lib/vagrant-dotvm/config/machine.rb +10 -0
  5. data/lib/vagrant-dotvm/config/network.rb +4 -0
  6. data/lib/vagrant-dotvm/config/provision.rb +4 -0
  7. data/lib/vagrant-dotvm/configinjecter.rb +42 -24
  8. data/lib/vagrant-dotvm/version.rb +1 -1
  9. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 545c505f26efb5f6cb1c5942a50ef7527c43d475
4
- data.tar.gz: 0fb0700ae56254b6c3ce17f00994183687c8e201
3
+ metadata.gz: e980d71762b2fb11dbcb58b93dda545cc84cc152
4
+ data.tar.gz: 162367673e933c5ecc22af25d2f1086ad1fb46c2
5
5
  SHA512:
6
- metadata.gz: 945f73762362513e6ea469102603b3ef0de865405891173dcafa5b84b3102f1c6bb421b9c91fae0d17deba840f3d7cb56e9b30de90822e6198d59c7cde1d8d8a
7
- data.tar.gz: 8682d1684a8eeca8023117d7a36bc939588669e9337fca88357c3d71257ebe6d6b9c536d0aeb32edd2e59c43d8adf608d2538ff70326fce34cd19f60a3315c7b
6
+ metadata.gz: 335d95277d7414f5994563de140fc32eda3641650782b150cd40df3b9c88506fd8c4547abc39500ef31af0c89e9c89576b827227b35d6b036616f6bcdaf63569
7
+ data.tar.gz: cf3cf6a12bf42df133b1fc9302b77dc072a14500ab03aae4d915b2a52da7b777c29772c5722d1a76cf76b13e61c883fb121025cb61f10eef1133e06e3f835537
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 0.21.0
2
+ * Support for more options - puppet provision
3
+ * Support for more options - vm
4
+ * Support for more options - network
5
+ * Fix for case when some options are missing - vm
6
+
1
7
  # 0.20.0
2
8
  * Now error is displayed when you specify unsupported option
3
9
  * Removal of next bunch of default parameters
data/README.md CHANGED
@@ -1,6 +1,7 @@
1
1
  # DotVm
2
2
 
3
3
  [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/krzysztof-magosa/vagrant-dotvm/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/krzysztof-magosa/vagrant-dotvm/?branch=master)
4
+ [![Gem Version](https://badge.fury.io/rb/vagrant-dotvm.svg)](http://badge.fury.io/rb/vagrant-dotvm)
4
5
 
5
6
  ## What is that?
6
7
  DotVm is vagrant plugin for easier maintenance of multi machine configurations.
data/lib/vagrant-dotvm/config/machine.rb CHANGED
@@ -24,6 +24,16 @@ module VagrantPlugins
24
24
  attr_accessor :hosts
25
25
  attr_accessor :options
26
26
  attr_accessor :shared_folders
27
+ attr_accessor :box_download_checksum
28
+ attr_accessor :box_download_checksum_type
29
+ attr_accessor :box_download_client_cert
30
+ attr_accessor :box_download_ca_cert
31
+ attr_accessor :box_download_ca_path
32
+ attr_accessor :box_download_insecure
33
+ attr_accessor :box_download_location_trusted
34
+ attr_accessor :box_url
35
+ attr_accessor :communicator
36
+ attr_accessor :guest
27
37
 
28
38
  def initialize()
29
39
  @primary = false
data/lib/vagrant-dotvm/config/network.rb CHANGED
@@ -11,6 +11,10 @@ module VagrantPlugins
11
11
  attr_accessor :host
12
12
  attr_accessor :protocol
13
13
  attr_accessor :bridge
14
+ attr_accessor :guest_ip
15
+ attr_accessor :host_ip
16
+ attr_accessor :auto_correct
17
+ attr_accessor :auto_config
14
18
 
15
19
  def initialize()
16
20
  @net = :private_network
data/lib/vagrant-dotvm/config/provision.rb CHANGED
@@ -13,6 +13,10 @@ module VagrantPlugins
13
13
  attr_accessor :manifest_file
14
14
  attr_accessor :privileged
15
15
  attr_accessor :run
16
+ attr_accessor :binary_path
17
+ attr_accessor :hiera_config_path
18
+ attr_accessor :environment
19
+ attr_accessor :environment_path
16
20
  end
17
21
  end
18
22
  end
data/lib/vagrant-dotvm/configinjecter.rb CHANGED
@@ -11,13 +11,23 @@ module VagrantPlugins
11
11
  vc.vm.define machine_cfg.nick,
12
12
  primary: machine_cfg.primary,
13
13
  autostart: machine_cfg.autostart do |machine|
14
- machine.vm.box = machine_cfg.box
15
- machine.vm.hostname = machine_cfg.name
16
- machine.vm.boot_timeout = machine_cfg.boot_timeout
17
- machine.vm.box_check_update = machine_cfg.box_check_update
18
- machine.vm.box_version = machine_cfg.box_version
19
- machine.vm.graceful_halt_timeout = machine_cfg.graceful_halt_timeout
20
- machine.vm.post_up_message = machine_cfg.post_up_message
14
+ machine.vm.box = machine_cfg.box unless machine_cfg.box.nil?
15
+ machine.vm.hostname = machine_cfg.name unless machine_cfg.name.nil?
16
+ machine.vm.boot_timeout = machine_cfg.boot_timeout unless machine_cfg.boot_timeout.nil?
17
+ machine.vm.box_check_update = machine_cfg.box_check_update unless machine_cfg.box_check_update.nil?
18
+ machine.vm.box_version = machine_cfg.box_version unless machine_cfg.box_version.nil?
19
+ machine.vm.graceful_halt_timeout = machine_cfg.graceful_halt_timeout unless machine_cfg.graceful_halt_timeout.nil?
20
+ machine.vm.post_up_message = machine_cfg.post_up_message unless machine_cfg.post_up_message.nil?
21
+ machine.vm.box_download_checksum = machine_cfg.box_download_checksum unless machine_cfg.box_download_checksum.nil?
22
+ machine.vm.box_download_checksum_type = machine_cfg.box_download_checksum_type unless machine_cfg.box_download_checksum_type.nil?
23
+ machine.vm.box_download_client_cert = machine_cfg.box_download_client_cert unless machine_cfg.box_download_client_cert.nil?
24
+ machine.vm.box_download_ca_cert = machine_cfg.box_download_ca_cert unless machine_cfg.box_download_ca_cert.nil?
25
+ machine.vm.box_download_ca_path = machine_cfg.box_download_ca_path unless machine_cfg.box_download_ca_path.nil?
26
+ machine.vm.box_download_insecure = machine_cfg.box_download_insecure unless machine_cfg.box_download_insecure.nil?
27
+ machine.vm.box_download_location_trusted = machine_cfg.box_download_location_trusted unless machine_cfg.box_download_location_trusted.nil?
28
+ machine.vm.box_url = machine_cfg.box_url unless machine_cfg.box_url.nil?
29
+ machine.vm.communicator = machine_cfg.communicator unless machine_cfg.communicator.nil?
30
+ machine.vm.guest = machine_cfg.guest unless machine_cfg.guest.nil?
21
31
 
22
32
  machine.vm.provider "virtualbox" do |vb|
23
33
  vb.customize ["modifyvm", :id, "--memory", machine_cfg.memory] unless machine_cfg.memory.nil?
@@ -32,14 +42,18 @@ module VagrantPlugins
32
42
 
33
43
  machine_cfg.networks.each do |net|
34
44
  hash = {}
35
- hash[:type] = net.type unless net.type.nil?
36
- hash[:ip] = net.ip unless net.ip.nil?
37
- hash[:netmask] = net.mask unless net.mask.nil?
38
- hash[:virtualbox__intnet] = net.interface unless net.interface.nil?
39
- hash[:guest] = net.guest unless net.guest.nil?
40
- hash[:host] = net.host unless net.host.nil?
41
- hash[:protocol] = net.protocol unless net.protocol.nil?
42
- hash[:bridge] = net.bridge unless net.bridge.nil?
45
+ hash[:type] = net.type unless net.type.nil?
46
+ hash[:ip] = net.ip unless net.ip.nil?
47
+ hash[:netmask] = net.mask unless net.mask.nil?
48
+ hash[:virtualbox__intnet] = net.interface unless net.interface.nil?
49
+ hash[:guest] = net.guest unless net.guest.nil?
50
+ hash[:host] = net.host unless net.host.nil?
51
+ hash[:protocol] = net.protocol unless net.protocol.nil?
52
+ hash[:bridge] = net.bridge unless net.bridge.nil?
53
+ hash[:guest_ip] = net.guest_ip unless net.guest_ip.nil?
54
+ hash[:host_ip] = net.host_ip unless net.host_ip.nil?
55
+ hash[:auto_correct] = net.auto_correct unless net.auto_correct.nil?
56
+ hash[:auto_config] = net.auto_config unless net.auto_config.nil?
43
57
 
44
58
  machine.vm.network net.net, **hash
45
59
  end
@@ -62,15 +76,19 @@ module VagrantPlugins
62
76
 
63
77
  machine_cfg.provision.each do |provision|
64
78
  machine.vm.provision provision.type, run: provision.run do |p|
65
- p.path = provision.path unless provision.path.nil?
66
- p.inline = provision.inline unless provision.inline.nil?
67
- p.args = provision.args unless provision.args.nil?
68
- p.privileged = provision.privileged unless provision.privileged.nil?
69
- p.source = provision.source unless provision.source.nil?
70
- p.destination = provision.destination unless provision.destination.nil?
71
- p.module_path = provision.module_path unless provision.module_path.nil?
72
- p.manifest_file = provision.manifest_file unless provision.manifest_file.nil?
73
- p.manifests_path = provision.manifests_path unless provision.manifests_path.nil?
79
+ p.path = provision.path unless provision.path.nil?
80
+ p.inline = provision.inline unless provision.inline.nil?
81
+ p.args = provision.args unless provision.args.nil?
82
+ p.privileged = provision.privileged unless provision.privileged.nil?
83
+ p.source = provision.source unless provision.source.nil?
84
+ p.destination = provision.destination unless provision.destination.nil?
85
+ p.module_path = provision.module_path unless provision.module_path.nil?
86
+ p.manifest_file = provision.manifest_file unless provision.manifest_file.nil?
87
+ p.manifests_path = provision.manifests_path unless provision.manifests_path.nil?
88
+ p.binary_path = provision.binary_path unless provision.binary_path.nil?
89
+ p.hiera_config_path = provision.hiera_config_path unless provision.hiera_config_path.nil?
90
+ p.environment = provision.environment unless provision.environment.nil?
91
+ p.environment_path = provision.environment_path unless provision.environment_path.nil?
74
92
  end
75
93
  end
76
94
 
data/lib/vagrant-dotvm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Dotvm
3
- VERSION = "0.20.0"
3
+ VERSION = "0.21.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-dotvm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.20.0
4
+ version: 0.21.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Krzysztof Magosa