Skip to content

Commit

Permalink
Upgrade puppet-lint and puppet-syntax checks
Browse files Browse the repository at this point in the history
Ignore vendor modules and update puppet itself to the version we
are using.

Change-Id: I754f4b7469317bde89c45842a42f216647eaf673
  • Loading branch information
Nikerabbit committed Jan 5, 2018
1 parent 481fd85 commit 31de5f2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 2 additions & 3 deletions Gemfile
@@ -1,8 +1,7 @@
source 'https://rubygems.org'

gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0'
gem 'puppet-lint', '1.1.0'
gem 'puppetlabs_spec_helper', '< 2.0.0'
gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 4.10.9'
gem 'puppetlabs_spec_helper', '< 3.0.0'

# Puppet 3.7 fails on ruby 2.2+
# https://tickets.puppetlabs.com/browse/PUP-3796
Expand Down
3 changes: 3 additions & 0 deletions Rakefile
Expand Up @@ -17,6 +17,9 @@
require 'puppet-lint/tasks/puppet-lint'
require 'puppet-syntax/tasks/puppet-syntax'

PuppetSyntax.exclude_paths = ["puppet/vendor/**/*"]
PuppetLint.configuration.pattern = "puppet/modules/**/*.pp"

task :default => [:help]

desc 'Show the help'
Expand Down
8 changes: 5 additions & 3 deletions puppet/modules/users/manifests/init.pp
Expand Up @@ -269,6 +269,7 @@
comment => 'Corey Floyd (WMF)';
}

# lint:ignore:140chars
ssh_authorized_key {
'siebrand_ssh':
ensure => present,
Expand All @@ -278,8 +279,9 @@
key => 'AAAAC3NzaC1lZDI1NTE5AAAAIHxdP9KdKSwuVpRaaevBbuCgPTV+2rvIe6Y57iOP57I6';
'fjalapeno_ssh':
ensure => present,
user => 'fjalapeno',
type => 'rsa',
key => 'AAAAB3NzaC1yc2EAAAABIwAAAQEA0FskuPOIjhNL4BGfI9p9FyWLt6DM5hjVMqPSz/puQ96Q1/Q92CTHT5gfthLVla/J/j14wW8G2vvz4ZBC1j123xNM4jbLo2jtbKitSTjr4vVf+Q4KPZ3R2ow/dOoWutKuoNwBBRSBBjjPv/F38aQRba4GRBflKhdOCmn6tUeE/Sk8U7WC7oSIfv2cZ1OC+PP9xFuG7a3FgWflzS+hwDyL3LGRlGlK6k3kI2IyOEwYlaZe/BTGZpC7Af+B1ad7z6PlzpKGDIomvMr8Q6r7GjEnAQnVJtXkMxsT0j4gSbcyUQMoBCzRDe7BR4CkiZXljxrvCGkhATav5gGI2DKT/uijlw==';
user => 'fjalapeno',
type => 'rsa',
key => 'AAAAB3NzaC1yc2EAAAABIwAAAQEA0FskuPOIjhNL4BGfI9p9FyWLt6DM5hjVMqPSz/puQ96Q1/Q92CTHT5gfthLVla/J/j14wW8G2vvz4ZBC1j123xNM4jbLo2jtbKitSTjr4vVf+Q4KPZ3R2ow/dOoWutKuoNwBBRSBBjjPv/F38aQRba4GRBflKhdOCmn6tUeE/Sk8U7WC7oSIfv2cZ1OC+PP9xFuG7a3FgWflzS+hwDyL3LGRlGlK6k3kI2IyOEwYlaZe/BTGZpC7Af+B1ad7z6PlzpKGDIomvMr8Q6r7GjEnAQnVJtXkMxsT0j4gSbcyUQMoBCzRDe7BR4CkiZXljxrvCGkhATav5gGI2DKT/uijlw==';
}
# lint:endignore
}

0 comments on commit 31de5f2

Please sign in to comment.