Skip to content

Commit 4354b79

Browse files
fnoopfnoop
committed
Update puppet-grafana to 4.1.0rc0, #576 
1 parent 4820b8d commit 4354b79

File tree

26 files changed

+276
-266
lines changed

26 files changed

+276
-266
lines changed

‎manifests/maverick-modules/base/manifests/packages.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
ensure_packages(["linux-firmware"])
3232
} elsif $operatingsystem == "Debian" {
3333
ensure_packages(["firmware-linux", "firmware-atheros", "firmware-brcm80211", "firmware-realtek"])
34-
if $::operatingsystemmajrelease == 9 {
34+
if $::operatingsystemmajrelease == "9" {
3535
ensure_packages(["firmware-misc-nonfree", "firmware-linux-nonfree"])
3636
} else {
3737
ensure_packages(["firmware-ralink"])

‎manifests/puppet-modules/grafana/.fixtures.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ fixtures:
33
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
44
archive: "https://github.com/voxpupuli/puppet-archive.git"
55
docker: "https://github.com/garethr/garethr-docker.git"
6-
wget: "https://github.com/maestrodev/puppet-wget.git"
76
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
87
symlinks:
98
grafana: "#{source_dir}"

‎manifests/puppet-modules/grafana/.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '0.21.3'
1+
modulesync_config_version: '1.1.0'

‎manifests/puppet-modules/grafana/.rubocop.yml‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Lint/AmbiguousOperator:
5151
Lint/AssignmentInCondition:
5252
Enabled: True
5353

54-
Style/SpaceBeforeComment:
54+
Layout/SpaceBeforeComment:
5555
Enabled: True
5656

5757
Style/AndOr:
@@ -119,7 +119,7 @@ Lint/UselessAssignment:
119119
Lint/Void:
120120
Enabled: True
121121

122-
Style/AccessModifierIndentation:
122+
Layout/AccessModifierIndentation:
123123
Enabled: True
124124

125125
Style/AccessorMethodName:
@@ -128,13 +128,13 @@ Style/AccessorMethodName:
128128
Style/Alias:
129129
Enabled: True
130130

131-
Style/AlignArray:
131+
Layout/AlignArray:
132132
Enabled: True
133133

134-
Style/AlignHash:
134+
Layout/AlignHash:
135135
Enabled: True
136136

137-
Style/AlignParameters:
137+
Layout/AlignParameters:
138138
Enabled: True
139139

140140
Metrics/BlockNesting:
@@ -152,7 +152,7 @@ Style/BracesAroundHashParameters:
152152
Style/CaseEquality:
153153
Enabled: True
154154

155-
Style/CaseIndentation:
155+
Layout/CaseIndentation:
156156
Enabled: True
157157

158158
Style/CharacterLiteral:
@@ -186,64 +186,64 @@ Style/WordArray:
186186
Style/UnneededPercentQ:
187187
Enabled: True
188188

189-
Style/Tab:
189+
Layout/Tab:
190190
Enabled: True
191191

192-
Style/SpaceBeforeSemicolon:
192+
Layout/SpaceBeforeSemicolon:
193193
Enabled: True
194194

195-
Style/TrailingBlankLines:
195+
Layout/TrailingBlankLines:
196196
Enabled: True
197197

198-
Style/SpaceInsideBlockBraces:
198+
Layout/SpaceInsideBlockBraces:
199199
Enabled: True
200200

201-
Style/SpaceInsideBrackets:
201+
Layout/SpaceInsideBrackets:
202202
Enabled: True
203203

204-
Style/SpaceInsideHashLiteralBraces:
204+
Layout/SpaceInsideHashLiteralBraces:
205205
Enabled: True
206206

207-
Style/SpaceInsideParens:
207+
Layout/SpaceInsideParens:
208208
Enabled: True
209209

210-
Style/LeadingCommentSpace:
210+
Layout/LeadingCommentSpace:
211211
Enabled: True
212212

213-
Style/SpaceBeforeFirstArg:
213+
Layout/SpaceBeforeFirstArg:
214214
Enabled: True
215215

216-
Style/SpaceAfterColon:
216+
Layout/SpaceAfterColon:
217217
Enabled: True
218218

219-
Style/SpaceAfterComma:
219+
Layout/SpaceAfterComma:
220220
Enabled: True
221221

222-
Style/SpaceAfterMethodName:
222+
Layout/SpaceAfterMethodName:
223223
Enabled: True
224224

225-
Style/SpaceAfterNot:
225+
Layout/SpaceAfterNot:
226226
Enabled: True
227227

228-
Style/SpaceAfterSemicolon:
228+
Layout/SpaceAfterSemicolon:
229229
Enabled: True
230230

231-
Style/SpaceAroundEqualsInParameterDefault:
231+
Layout/SpaceAroundEqualsInParameterDefault:
232232
Enabled: True
233233

234-
Style/SpaceAroundOperators:
234+
Layout/SpaceAroundOperators:
235235
Enabled: True
236236

237-
Style/SpaceBeforeBlockBraces:
237+
Layout/SpaceBeforeBlockBraces:
238238
Enabled: True
239239

240-
Style/SpaceBeforeComma:
240+
Layout/SpaceBeforeComma:
241241
Enabled: True
242242

243243
Style/CollectionMethods:
244244
Enabled: True
245245

246-
Style/CommentIndentation:
246+
Layout/CommentIndentation:
247247
Enabled: True
248248

249249
Style/ColonMethodCall:
@@ -268,7 +268,7 @@ Style/DefWithParentheses:
268268
Style/PreferredHashMethods:
269269
Enabled: True
270270

271-
Style/DotPosition:
271+
Layout/DotPosition:
272272
EnforcedStyle: trailing
273273

274274
Style/DoubleNegation:
@@ -277,25 +277,25 @@ Style/DoubleNegation:
277277
Style/EachWithObject:
278278
Enabled: True
279279

280-
Style/EmptyLineBetweenDefs:
280+
Layout/EmptyLineBetweenDefs:
281281
Enabled: True
282282

283-
Style/IndentArray:
283+
Layout/IndentArray:
284284
Enabled: True
285285

286-
Style/IndentHash:
286+
Layout/IndentHash:
287287
Enabled: True
288288

289-
Style/IndentationConsistency:
289+
Layout/IndentationConsistency:
290290
Enabled: True
291291

292-
Style/IndentationWidth:
292+
Layout/IndentationWidth:
293293
Enabled: True
294294

295-
Style/EmptyLines:
295+
Layout/EmptyLines:
296296
Enabled: True
297297

298-
Style/EmptyLinesAroundAccessModifier:
298+
Layout/EmptyLinesAroundAccessModifier:
299299
Enabled: True
300300

301301
Style/EmptyLiteral:
@@ -314,7 +314,7 @@ Style/MethodDefParentheses:
314314
Style/LineEndConcatenation:
315315
Enabled: True
316316

317-
Style/TrailingWhitespace:
317+
Layout/TrailingWhitespace:
318318
Enabled: True
319319

320320
Style/StringLiterals:
@@ -466,9 +466,6 @@ Metrics/ParameterLists:
466466
Lint/RequireParentheses:
467467
Enabled: True
468468

469-
Style/SpaceBeforeFirstArg:
470-
Enabled: True
471-
472469
Style/ModuleFunction:
473470
Enabled: True
474471

@@ -484,7 +481,7 @@ Style/Encoding:
484481
Style/BlockDelimiters:
485482
Enabled: True
486483

487-
Style/MultilineBlockLayout:
484+
Layout/MultilineBlockLayout:
488485
Enabled: True
489486

490487
# 'Complexity' is very relative
@@ -498,7 +495,7 @@ Metrics/PerceivedComplexity:
498495
Lint/UselessAssignment:
499496
Enabled: True
500497

501-
Style/ClosingParenthesisIndentation:
498+
Layout/ClosingParenthesisIndentation:
502499
Enabled: True
503500

504501
# RSpec
@@ -527,7 +524,7 @@ RSpec/NestedGroups:
527524
Enabled: False
528525

529526
# this is broken on ruby1.9
530-
Style/IndentHeredoc:
527+
Layout/IndentHeredoc:
531528
Enabled: False
532529

533530
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs

‎manifests/puppet-modules/grafana/.sync.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
.travis.yml:
33
secure: "qtLA1TPKaVgd9rvi0kkF2v0CP0QLls//lFHJ9IowTYNi5O+0dx7OxZCK3g4nkNWWbsujS464/YFJqVRWoXIeLIyFtfMKkaRAiuaukxOQqnzD+BsnpYYeo2zeZPCvMbB94+7G7JQ+jpuzlsHX6j+H6LQEj6+kXzd8NAj8rlygrL8XcFN3bA8XM/unCvqn2b2sduShExVl0mnNMIvZMHCbdrEzByXkz+FmyGYCay+feDIYbIbhzYLNnh6BcDkq24TxRmVOdEnUkPG6ZU0UJlNqBZB++zAIazR25NyX+b22/CFp6D6YJKkJvBNnywGUNNF21s4a6kPoEnUVBEO6yg5sDkKgp8nAvsmUnI8A1tfRFWKejxHZN3YqveY60xiNIUEHJU4MjEE6VVi9WpNW8CpJbfP/z3RtlU5n4ckSER7mb/ApxspUPJRzyMKjobDP12WU/bgXinzdNMu6PH9H56WkDpRNtIYnNhIAuirdfDr2Ok5z9/9yObUt/OQddM4wrOnMG7lyyUIzAO2OOJbIcOaZBedTKccpCu6k2mOkUHhMutf1D0bde5IGhrs7E54V2ZNxX5Dopv5eOrmVN2OxdcB9g8nmISxX6Tty/BNrTBvt7urthGjUJrjlnNE/K1595KmcWa6PGWUcYZyzdKeWqiA3+iWKSmnx1Ri0lsml5Z/a4QM="
4+
docker_sets:
5+
- set: docker/ubuntu-16.04
6+
- set: docker/centos-7
47
Gemfile:
58
optional:
69
':test':

‎manifests/puppet-modules/grafana/.travis.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,30 @@ script:
1515
matrix:
1616
fast_finish: true
1717
include:
18+
- rvm: 2.4.1
19+
bundler_args: --without development
20+
dist: trusty
21+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker
22+
services: docker
23+
sudo: required
24+
- rvm: 2.4.1
25+
bundler_args: --without development
26+
dist: trusty
27+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
28+
services: docker
29+
sudo: required
1830
- rvm: 2.1.9
1931
bundler_args: --without system_tests development
2032
env: PUPPET_VERSION="~> 4.0" CHECK=test
21-
- rvm: 2.2.7
22-
bundler_args: --without system_tests development
23-
env: PUPPET_VERSION="~> 4.0" CHECK=test
24-
- rvm: 2.3.4
25-
bundler_args: --without system_tests development
26-
env: PUPPET_VERSION="~> 4.0" CHECK=test
2733
- rvm: 2.4.1
2834
bundler_args: --without system_tests development
29-
env: PUPPET_VERSION="~> 4.0" CHECK=test
35+
env: PUPPET_VERSION="~> 5.0" CHECK=test
3036
- rvm: 2.4.1
3137
bundler_args: --without system_tests development
32-
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
38+
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
3339
- rvm: 2.4.1
3440
bundler_args: --without system_tests development
35-
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
41+
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
3642
branches:
3743
only:
3844
- master

0 commit comments

Comments
 (0)