diff --git a/Gemfile b/Gemfile index 4f2f8d6..bd06dfe 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ group :development, :unit_tests do # puppet-lint and plugins 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-empty_string-check', '~> 0.2' gem 'puppet-lint-leading_zero-check', '~> 0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2bbe471..4786bd0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM locale (~> 2.1) multi_json (~> 1.10) 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-absolute_template_path (1.0.1) puppet-lint (>= 1.1, < 3.0) @@ -168,7 +168,7 @@ DEPENDENCIES os (~> 1.0) puppet (>= 5, < 6) 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-empty_string-check (~> 0.2) puppet-lint-leading_zero-check (~> 0.1) diff --git a/puppet/production/manifests/site.pp b/puppet/production/manifests/site.pp index 0227667..a5f92a5 100644 --- a/puppet/production/manifests/site.pp +++ b/puppet/production/manifests/site.pp @@ -12,18 +12,18 @@ node default { } node 'bowl' { - include ::role::workstation + include role::workstation } node 'gene' { - include ::role::workstation + include role::workstation } node 'mintstring' { - include ::role::workstation + include role::workstation } node 'yellowbadger' { - include ::role::workstation + include role::workstation } diff --git a/puppet/production/site/profile/manifests/linux.pp b/puppet/production/site/profile/manifests/linux.pp index f658d45..eed4e64 100644 --- a/puppet/production/site/profile/manifests/linux.pp +++ b/puppet/production/site/profile/manifests/linux.pp @@ -1,8 +1,8 @@ # Select a profile based on the OS family class profile::linux { case $facts['os']['family'] { - 'Debian': { include ::profile::linux::debian } - 'RedHat': { include ::profile::linux::el } + 'Debian': { include profile::linux::debian } + 'RedHat': { include profile::linux::el } default: { fail("${facts['os']['family']} isn't supported yet") } } diff --git a/puppet/production/site/profile/manifests/linux/el.pp b/puppet/production/site/profile/manifests/linux/el.pp index 0c6e496..5d25ae1 100644 --- a/puppet/production/site/profile/manifests/linux/el.pp +++ b/puppet/production/site/profile/manifests/linux/el.pp @@ -5,7 +5,7 @@ class profile::linux::el { $gid = find_group($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 $yum_packages = [ diff --git a/puppet/production/site/role/manifests/server.pp b/puppet/production/site/role/manifests/server.pp index 41fd474..fdaedc4 100644 --- a/puppet/production/site/role/manifests/server.pp +++ b/puppet/production/site/role/manifests/server.pp @@ -3,5 +3,5 @@ # are not standing in front of the system and / or there is no graphical # interface. class role::server { - include ::profile::base + include profile::base } diff --git a/puppet/production/site/role/manifests/workstation.pp b/puppet/production/site/role/manifests/workstation.pp index e0ae415..4fc5c37 100644 --- a/puppet/production/site/role/manifests/workstation.pp +++ b/puppet/production/site/role/manifests/workstation.pp @@ -1,13 +1,13 @@ # Includes all the profiles needed for a workstation class role::workstation { - include ::profile::base + include profile::base case $facts['kernel'] { 'Darwin': { - include ::profile::mac + include profile::mac } 'Linux': { - include ::profile::linux + include profile::linux } default: { fail("${facts['kernel']} hasn't been setup in the workstation role yet.")