Merge pull request #18 from genebean/puppet-lint

Updated based on puppet-lint gem update
This commit is contained in:
Gene Liverman 2019-12-26 21:20:03 -05:00 committed by GitHub
commit 0bccd623c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions

View file

@ -32,7 +32,7 @@ group :development, :unit_tests do
# puppet-lint and plugins # puppet-lint and plugins
gem 'puppet-lint', '~> 2.3' gem 'puppet-lint', '~> 2.3'
gem 'puppet-lint-absolute_classname-check', '~> 0.2' gem 'puppet-lint-absolute_classname-check', '~> 2.0'
gem 'puppet-lint-absolute_template_path', '~> 1.0' gem 'puppet-lint-absolute_template_path', '~> 1.0'
gem 'puppet-lint-empty_string-check', '~> 0.2' gem 'puppet-lint-empty_string-check', '~> 0.2'
gem 'puppet-lint-leading_zero-check', '~> 0.1' gem 'puppet-lint-leading_zero-check', '~> 0.1'

View file

@ -63,7 +63,7 @@ GEM
locale (~> 2.1) locale (~> 2.1)
multi_json (~> 1.10) multi_json (~> 1.10)
puppet-lint (2.4.2) puppet-lint (2.4.2)
puppet-lint-absolute_classname-check (0.2.5) puppet-lint-absolute_classname-check (2.0.0)
puppet-lint (>= 1.0, < 3.0) puppet-lint (>= 1.0, < 3.0)
puppet-lint-absolute_template_path (1.0.1) puppet-lint-absolute_template_path (1.0.1)
puppet-lint (>= 1.1, < 3.0) puppet-lint (>= 1.1, < 3.0)
@ -168,7 +168,7 @@ DEPENDENCIES
os (~> 1.0) os (~> 1.0)
puppet (>= 5, < 6) puppet (>= 5, < 6)
puppet-lint (~> 2.3) puppet-lint (~> 2.3)
puppet-lint-absolute_classname-check (~> 0.2) puppet-lint-absolute_classname-check (~> 2.0)
puppet-lint-absolute_template_path (~> 1.0) puppet-lint-absolute_template_path (~> 1.0)
puppet-lint-empty_string-check (~> 0.2) puppet-lint-empty_string-check (~> 0.2)
puppet-lint-leading_zero-check (~> 0.1) puppet-lint-leading_zero-check (~> 0.1)

View file

@ -12,18 +12,18 @@ node default {
} }
node 'bowl' { node 'bowl' {
include ::role::workstation include role::workstation
} }
node 'gene' { node 'gene' {
include ::role::workstation include role::workstation
} }
node 'mintstring' { node 'mintstring' {
include ::role::workstation include role::workstation
} }
node 'yellowbadger' { node 'yellowbadger' {
include ::role::workstation include role::workstation
} }

View file

@ -1,8 +1,8 @@
# Select a profile based on the OS family # Select a profile based on the OS family
class profile::linux { class profile::linux {
case $facts['os']['family'] { case $facts['os']['family'] {
'Debian': { include ::profile::linux::debian } 'Debian': { include profile::linux::debian }
'RedHat': { include ::profile::linux::el } 'RedHat': { include profile::linux::el }
default: { fail("${facts['os']['family']} isn't supported yet") } default: { fail("${facts['os']['family']} isn't supported yet") }
} }

View file

@ -5,7 +5,7 @@ class profile::linux::el {
$gid = find_group($homedir) $gid = find_group($homedir)
$user = homedir_to_user($homedir) $user = homedir_to_user($homedir)
include ::profile::linux::el::docker_repos include profile::linux::el::docker_repos
Yumrepo <| |> -> Package <| |> # lint:ignore:spaceship_operator_without_tag Yumrepo <| |> -> Package <| |> # lint:ignore:spaceship_operator_without_tag
$yum_packages = [ $yum_packages = [

View file

@ -3,5 +3,5 @@
# are not standing in front of the system and / or there is no graphical # are not standing in front of the system and / or there is no graphical
# interface. # interface.
class role::server { class role::server {
include ::profile::base include profile::base
} }

View file

@ -1,13 +1,13 @@
# Includes all the profiles needed for a workstation # Includes all the profiles needed for a workstation
class role::workstation { class role::workstation {
include ::profile::base include profile::base
case $facts['kernel'] { case $facts['kernel'] {
'Darwin': { 'Darwin': {
include ::profile::mac include profile::mac
} }
'Linux': { 'Linux': {
include ::profile::linux include profile::linux
} }
default: { default: {
fail("${facts['kernel']} hasn't been setup in the workstation role yet.") fail("${facts['kernel']} hasn't been setup in the workstation role yet.")