opendev
/
puppet-openstackid
Code Issues Proposed changes

Puppet-lint says "class included by absolute name" 

Get rid of lots of leading :: prefixes because the puppet-lint
authors think that's prettier for some reason.

Change-Id: If1f0fcebe4305861ff6cabe596feb023548cf23a
This commit is contained in:
Jeremy Stanley 2020-01-22 04:03:11 +00:00
parent 8341bbfd32
commit 7091e5ced9
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/init.pp
View File

@ -303,7 +303,7 @@ class openstackid (
}
# force 10.x version
class { '::nodejs':
class { 'nodejs':
repo_url_suffix => '10.x',
legacy_debian_symlinks => false,
}
@ -356,7 +356,7 @@ class openstackid (
group => 'www-data',
mode => '0640',
content => $mysql_ssl_ca_file_contents,
notify => Class['::apache::service'],
notify => Class['apache::service'],
before => Apache::Vhost::Custom[$vhost_name],
require => File['/etc/mysql-client-ssl'],
}
@ -369,7 +369,7 @@ class openstackid (
group => 'www-data',
mode => '0640',
content => $mysql_ssl_client_key_file_contents,
notify => Class['::apache::service'],
notify => Class['apache::service'],
before => Apache::Vhost::Custom[$vhost_name],
require => File['/etc/mysql-client-ssl'],
}
@ -382,7 +382,7 @@ class openstackid (
group => 'www-data',
mode => '0640',
content => $mysql_ssl_client_cert_file_contents,
notify => Class['::apache::service'],
notify => Class['apache::service'],
before => Apache::Vhost::Custom[$vhost_name],
require => File['/etc/mysql-client-ssl'],
}
@ -398,13 +398,13 @@ class openstackid (
mode => '0755',
}
class { '::apache':
class { 'apache':
default_vhost => false,
mpm_module => false,
}
# apache mpm event connection tweaking
class {'::apache::mod::event':
class {'apache::mod::event':
serverlimit => 16,
startservers => 3,
threadlimit => 256,
@ -414,20 +414,20 @@ class openstackid (
maxrequestworkers => 4096,
}
::apache::listen { '80': }
::apache::listen { '443': }
apache::listen { '80': }
apache::listen { '443': }
::apache::vhost::custom { $vhost_name:
apache::vhost::custom { $vhost_name:
priority => '50',
content => template('openstackid/vhost.erb'),
require => File[$docroot_dirs],
}
class { '::apache::mod::ssl': }
class { '::apache::mod::rewrite': }
class { '::apache::mod::proxy': }
class { 'apache::mod::ssl': }
class { 'apache::mod::rewrite': }
class { 'apache::mod::proxy': }
::apache::mod { 'proxy_fcgi': }
apache::mod { 'proxy_fcgi': }
if $ssl_cert_file_contents != '' {
file { $ssl_cert_file:
@ -435,7 +435,7 @@ class openstackid (
group => 'root',
mode => '0640',
content => $ssl_cert_file_contents,
notify => Class['::apache::service'],
notify => Class['apache::service'],
before => Apache::Vhost::Custom[$vhost_name],
}
}
@ -446,7 +446,7 @@ class openstackid (
group => 'root',
mode => '0640',
content => $ssl_key_file_contents,
notify => Class['::apache::service'],
notify => Class['apache::service'],
before => Apache::Vhost::Custom[$vhost_name],
}
}
@ -457,7 +457,7 @@ class openstackid (
group => 'root',
mode => '0640',
content => $ssl_chain_file_contents,
notify => Class['::apache::service'],
notify => Class['apache::service'],
before => Apache::Vhost::Custom[$vhost_name],
}
}
@ -486,7 +486,7 @@ class openstackid (
File['/etc/openstackid/.env'],
Package['curl'],
Package[$php_packages] ,
Class['::nodejs'],
Class['nodejs'],
]
$update_site_requires = [
@ -494,7 +494,7 @@ class openstackid (
Apache::Vhost::Custom[$vhost_name],
File['/etc/openstackid/.env'],
Package[$php_packages] ,
Class['::nodejs'],
Class['nodejs'],
]
exec { 'deploy-site':