vmpooler 2.1.0 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/vmpooler/api/helpers.rb +363 -294
  3. data/lib/vmpooler/api/v1.rb +482 -377
  4. data/lib/vmpooler/providers/base.rb +1 -1
  5. data/lib/vmpooler/version.rb +1 -1
  6. data/lib/vmpooler.rb +2 -1
  7. metadata +36 -16
data/lib/vmpooler/providers/base.rb CHANGED
@@ -242,7 +242,7 @@ module Vmpooler
242
242
  # returns
243
243
  # nil when successful. Raises error when encountered
244
244
  def create_template_delta_disks(_pool)
245
- raise("#{self.class.name} does not implement create_template_delta_disks")
245
+ puts("#{self.class.name} does not implement create_template_delta_disks")
246
246
  end
247
247
 
248
248
  # inputs
data/lib/vmpooler/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Vmpooler
4
- VERSION = '2.1.0'
4
+ VERSION = '2.2.0'
5
5
  end
data/lib/vmpooler.rb CHANGED
@@ -3,6 +3,7 @@
3
3
  module Vmpooler
4
4
  require 'concurrent'
5
5
  require 'date'
6
+ require 'deep_merge'
6
7
  require 'json'
7
8
  require 'net/ldap'
8
9
  require 'open-uri'
@@ -42,7 +43,7 @@ module Vmpooler
42
43
  extra_configs = parsed_config[:config]['extra_config'].split(',')
43
44
  extra_configs.each do |config|
44
45
  extra_config = YAML.load_file(config)
45
- parsed_config.merge!(extra_config)
46
+ parsed_config.deep_merge(extra_config)
46
47
  end
47
48
  end
48
49
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vmpooler
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-13 00:00:00.000000000 Z
11
+ date: 2021-12-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: concurrent-ruby
@@ -38,6 +38,20 @@ dependencies:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '2.2'
41
+ - !ruby/object:Gem::Dependency
42
+ name: deep_merge
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '1.2'
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: '1.2'
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: net-ldap
43
57
  requirement: !ruby/object:Gem::Requirement
@@ -72,84 +86,90 @@ dependencies:
72
86
  requirements:
73
87
  - - '='
74
88
  - !ruby/object:Gem::Version
75
- version: 0.17.0
89
+ version: 0.20.1
76
90
  type: :runtime
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
94
  - - '='
81
95
  - !ruby/object:Gem::Version
82
- version: 0.17.0
96
+ version: 0.20.1
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: opentelemetry-instrumentation-concurrent_ruby
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - '='
88
102
  - !ruby/object:Gem::Version
89
- version: 0.17.0
103
+ version: 0.19.2
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - '='
95
109
  - !ruby/object:Gem::Version
96
- version: 0.17.0
110
+ version: 0.19.2
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: opentelemetry-instrumentation-redis
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - '='
102
116
  - !ruby/object:Gem::Version
103
- version: 0.17.0
117
+ version: 0.21.2
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - '='
109
123
  - !ruby/object:Gem::Version
110
- version: 0.17.0
124
+ version: 0.21.2
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: opentelemetry-instrumentation-sinatra
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - '='
116
130
  - !ruby/object:Gem::Version
117
- version: 0.17.0
131
+ version: 0.19.3
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - '='
123
137
  - !ruby/object:Gem::Version
124
- version: 0.17.0
138
+ version: 0.19.3
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: opentelemetry-resource_detectors
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
143
  - - '='
130
144
  - !ruby/object:Gem::Version
131
- version: 0.17.0
145
+ version: 0.19.1
132
146
  type: :runtime
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
150
  - - '='
137
151
  - !ruby/object:Gem::Version
138
- version: 0.17.0
152
+ version: 0.19.1
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: opentelemetry-sdk
141
155
  requirement: !ruby/object:Gem::Requirement
142
156
  requirements:
143
- - - '='
157
+ - - "~>"
144
158
  - !ruby/object:Gem::Version
145
- version: 0.17.0
159
+ version: '1.0'
160
+ - - ">="
161
+ - !ruby/object:Gem::Version
162
+ version: 1.0.2
146
163
  type: :runtime
147
164
  prerelease: false
148
165
  version_requirements: !ruby/object:Gem::Requirement
149
166
  requirements:
150
- - - '='
167
+ - - "~>"
151
168
  - !ruby/object:Gem::Version
152
- version: 0.17.0
169
+ version: '1.0'
170
+ - - ">="
171
+ - !ruby/object:Gem::Version
172
+ version: 1.0.2
153
173
  - !ruby/object:Gem::Dependency
154
174
  name: pickup
155
175
  requirement: !ruby/object:Gem::Requirement