Skip to content

Commit 8234263

Browse files
ekohlehelms
authored andcommitted
puppet-lint autofix with voxpupuli-test 5
1 parent 6ff5323 commit 8234263

File tree

18 files changed

+4
-25
lines changed

18 files changed

+4
-25
lines changed

manifests/apache.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
Stdlib::Absolutepath $ca_key_password_file = $certs::ca_key_password_file,
2020
String $group = $certs::group,
2121
) inherits certs {
22-
2322
$apache_cert_name = "${hostname}-apache"
2423
$apache_cert = "${pki_dir}/certs/katello-apache.crt"
2524
$apache_key = "${pki_dir}/private/katello-apache.key"

manifests/ca.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
String $ca_key_password = $certs::ca_key_password,
2424
Stdlib::Absolutepath $ca_key_password_file = $certs::ca_key_password_file,
2525
) {
26-
2726
file { $ca_key_password_file:
2827
ensure => file,
2928
content => $ca_key_password,
@@ -48,7 +47,6 @@
4847
}
4948
$default_ca = Ca[$default_ca_name]
5049

51-
5250
if $server_cert {
5351
ca { $server_ca_name:
5452
ensure => present,

manifests/config.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
Stdlib::Absolutepath $pki_dir = $certs::pki_dir,
55
String $group = $certs::group,
66
) {
7-
87
file { $pki_dir:
98
ensure => directory,
109
owner => 'root',
@@ -25,5 +24,4 @@
2524
group => $group,
2625
mode => '0750',
2726
}
28-
2927
}

manifests/foreman.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
String $owner = 'root',
2121
String $group = 'foreman',
2222
) inherits certs {
23-
2423
$client_cert_name = "${hostname}-foreman-client"
2524
$client_dn = "CN=${hostname}, OU=${org_unit}, O=${org}, ST=${state}, C=${country}"
2625

manifests/foreman_proxy.pp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
Stdlib::Filemode $private_key_mode = '0440',
3535
Stdlib::Filemode $public_key_mode = '0444',
3636
) inherits certs {
37-
3837
$proxy_cert_name = "${hostname}-foreman-proxy"
3938
$foreman_proxy_client_cert_name = "${hostname}-foreman-proxy-client"
4039
$foreman_proxy_ssl_client_bundle = "${pki_dir}/private/${foreman_proxy_client_cert_name}-bundle.pem"
@@ -93,7 +92,6 @@
9392
}
9493

9594
if $deploy {
96-
9795
certs::keypair { $proxy_cert_name:
9896
source_dir => "${certs::ssl_build_dir}/${hostname}",
9997
key_file => $proxy_key,
@@ -148,6 +146,5 @@
148146
mode => $public_key_mode,
149147
require => Cert[$foreman_proxy_client_cert_name],
150148
}
151-
152149
}
153150
}

manifests/foreman_proxy_content.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
Stdlib::Fqdn $parent_fqdn = $certs::foreman_proxy_content::params::parent_fqdn,
2020
Array[Stdlib::Fqdn] $foreman_proxy_cname = $certs::foreman_proxy_content::params::foreman_proxy_cname,
2121
) inherits certs::foreman_proxy_content::params {
22-
2322
if $foreman_proxy_fqdn == $facts['networking']['fqdn'] {
2423
fail('The hostname is the same as the provided hostname for the foreman-proxy')
2524
}

manifests/init.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
String $server_ca_name = 'katello-server-ca',
9494
Optional[Stdlib::Absolutepath] $tar_file = undef,
9595
) inherits certs::params {
96-
9796
if $server_cert {
9897
validate_file_exists($server_cert, $server_key, $server_ca_cert)
9998
if $server_cert_req {

manifests/install.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# @summary Install required tools
22
# @api private
33
class certs::install {
4-
54
package { 'katello-certs-tools':
65
ensure => installed,
76
}
8-
97
}

manifests/keypair.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
Boolean $key_decrypt = false,
1616
Optional[Stdlib::Absolutepath] $key_password_file = undef,
1717
) {
18-
1918
private_key { $key_file:
2019
ensure => $key_ensure,
2120
source => "${source_dir}/${title}.key",
@@ -33,5 +32,4 @@
3332
group => $cert_group,
3433
mode => $cert_mode,
3534
}
36-
3735
}

manifests/params.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Certs Parameters
22
class certs::params {
3-
43
$pki_dir = '/etc/pki/katello'
54
$node_fqdn = $facts['networking']['fqdn']
65

0 commit comments

Comments
 (0)