Remove ::'s that linter now complians about

Avoid issues from linter:

 WARNING: class included by absolute name (::$class) on line ...

Change-Id: Ia25bea4693acd44d3541500698e7fa978613f459
This commit is contained in:
Ian Wienand 2020-02-12 11:08:05 +11:00
parent e263ff92e3
commit e66b8a82cd
6 changed files with 18 additions and 18 deletions

View File

@ -20,7 +20,7 @@ node 'default' {
case $db_provider { case $db_provider {
'mysql': { 'mysql': {
class { '::mysql::server': class { 'mysql::server':
} }
mysql::db { 'askbotdb': mysql::db { 'askbotdb':
@ -32,7 +32,7 @@ node 'default' {
} }
} }
'pgsql': { 'pgsql': {
class { '::postgresql::server': } class { 'postgresql::server': }
postgresql::server::db { $db_name: postgresql::server::db { $db_name:
user => $db_user, user => $db_user,
@ -46,7 +46,7 @@ node 'default' {
} }
# redis (custom module written by tipit) # redis (custom module written by tipit)
class { '::redis': class { 'redis':
redis_port => $redis_port, redis_port => $redis_port,
redis_max_memory => $redis_max_memory, redis_max_memory => $redis_max_memory,
redis_bind => $redis_bind, redis_bind => $redis_bind,
@ -56,7 +56,7 @@ node 'default' {
} }
# solr search engine # solr search engine
class { '::solr': class { 'solr':
mirror => 'http://apache.mesi.com.ar/lucene/solr', mirror => 'http://apache.mesi.com.ar/lucene/solr',
version => $solr_version, version => $solr_version,
cores => [ 'core-default', 'core-en', 'core-zh' ], cores => [ 'core-default', 'core-en', 'core-zh' ],
@ -93,7 +93,7 @@ node 'default' {
require => Exec['copy-solr'], require => Exec['copy-solr'],
} }
class { '::askbot': class { 'askbot':
db_provider => $db_provider, db_provider => $db_provider,
db_name => $db_name, db_name => $db_name,
db_user => $db_user, db_user => $db_user,

View File

@ -52,7 +52,7 @@ class askbot::config (
} }
if $site_ssl_enabled { if $site_ssl_enabled {
class { '::askbot::site::ssl': class { 'askbot::site::ssl':
site_name => $site_name, site_name => $site_name,
site_ssl_cert_file_contents => $site_ssl_cert_file_contents, site_ssl_cert_file_contents => $site_ssl_cert_file_contents,
site_ssl_key_file_contents => $site_ssl_key_file_contents, site_ssl_key_file_contents => $site_ssl_key_file_contents,
@ -63,16 +63,16 @@ class askbot::config (
} }
} }
class { '::askbot::site::http': class { 'askbot::site::http':
site_root => $site_root, site_root => $site_root,
site_name => $site_name, site_name => $site_name,
} }
class { '::askbot::site::celeryd': class { 'askbot::site::celeryd':
site_root => $site_root, site_root => $site_root,
} }
class { '::askbot::site::config': class { 'askbot::site::config':
site_root => $site_root, site_root => $site_root,
dist_root => $dist_root, dist_root => $dist_root,
db_provider => $db_provider, db_provider => $db_provider,
@ -95,16 +95,16 @@ class askbot::config (
template_settings => $template_settings, template_settings => $template_settings,
} }
class { '::askbot::site::static': class { 'askbot::site::static':
site_root => $site_root, site_root => $site_root,
} }
class { '::askbot::site::log': class { 'askbot::site::log':
site_root => $site_root, site_root => $site_root,
www_group => $www_group, www_group => $www_group,
} }
class { '::askbot::site::cron': class { 'askbot::site::cron':
site_root => $site_root, site_root => $site_root,
} }

View File

@ -93,7 +93,7 @@ class askbot (
$www_user = 'www-data', $www_user = 'www-data',
) { ) {
class { '::askbot::install': class { 'askbot::install':
db_provider => $db_provider, db_provider => $db_provider,
dist_root => $dist_root, dist_root => $dist_root,
askbot_repo => $askbot_repo, askbot_repo => $askbot_repo,
@ -140,7 +140,7 @@ class askbot (
} }
} }
class { '::askbot::config': class { 'askbot::config':
site_root => $site_root, site_root => $site_root,
dist_root => $dist_root, dist_root => $dist_root,
www_group => $www_group, www_group => $www_group,

View File

@ -19,7 +19,7 @@ class askbot::install (
ensure => present, ensure => present,
} }
class { '::python': class { 'python':
pip => true, pip => true,
dev => true, dev => true,
virtualenv => true, virtualenv => true,
@ -132,7 +132,7 @@ class askbot::install (
require => Python::Virtualenv['/usr/askbot-env'], require => Python::Virtualenv['/usr/askbot-env'],
} }
include ::httpd::mod::wsgi include httpd::mod::wsgi
exec { 'askbot-install': exec { 'askbot-install':
path => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin', '/usr/local/bin' ], path => [ '/bin', '/sbin' , '/usr/bin', '/usr/sbin', '/usr/local/bin' ],

View File

@ -31,7 +31,7 @@ class askbot::site::log (
require => File["${site_root}/log"], require => File["${site_root}/log"],
} }
include ::logrotate include logrotate
logrotate::file { 'askbot': logrotate::file { 'askbot':
log => "${site_root}/log/askbot.log", log => "${site_root}/log/askbot.log",
options => [ options => [

View File

@ -9,7 +9,7 @@ class askbot::site::ssl (
$site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key', $site_ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
$site_ssl_key_file_contents = undef, $site_ssl_key_file_contents = undef,
) { ) {
include ::httpd::ssl include httpd::ssl
# site x509 certificate # site x509 certificate
if $site_ssl_cert_file_contents != undef { if $site_ssl_cert_file_contents != undef {