Skip to content

Commit bb551df

Browse files
committed
fixed most important puppet lint issues
1 parent 2ca4d49 commit bb551df

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

manifests/init.pp

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
# will create a rule :
1818
# rule deny { subject-issuer = 'CN=bad guys' }
1919
class argus (
20-
$open_firewall = false,
21-
2220
#the argus pap server used by pdp
2321
$pap_server,
2422
#the argus pdp server used by pep
@@ -31,8 +29,6 @@
3129

3230
#this will setup the voms related things :
3331
$supported_vos,
34-
#this will create argus "permit" rules for those VOs if true
35-
$supported_vos_allowed = true,
3632

3733
# site name is required
3834
$sitename,
@@ -43,27 +39,35 @@
4339
# pep params
4440
$pepd_port,
4541
$pepd_admin_port,
46-
$pepd_pass = randompass(),
4742

4843
# pdp params
4944
$pdps_port,
5045
$pdp_port,
5146
$pdp_admin_port,
52-
$pdp_pass = randompass(),
5347
$pdp_retention_interval,
5448

5549
# pap parameters
5650
$pap_port,
5751
$pap_shutdown_port,
58-
$pap_shutdown_command = randompass(),
59-
6052

6153
# central banning setup
6254
$centralbanning_dn,
6355
$centralbanning_hostname,
6456
$centralbanning_port,
6557
$centralbanning_public,
6658
$poll_interval,
59+
#files
60+
$grid_mapfile,
61+
$grid_mapdir,
62+
$group_mapfile,
63+
64+
$open_firewall = false,
65+
#this will create argus "permit" rules for those VOs if true
66+
$supported_vos_allowed = true,
67+
68+
$pepd_pass = randompass(),
69+
$pdp_pass = randompass(),
70+
$pap_shutdown_command = randompass(),
6771

6872
$service_name = $::fqdn ,
6973

@@ -105,13 +109,6 @@
105109
# ...
106110

107111
$pap_rules = {},
108-
109-
#files
110-
$grid_mapfile,
111-
$grid_mapdir,
112-
$group_mapfile,
113-
114-
115112
) {
116113

117114
$pap_service_dn = "${site_base_dn}=${service_name}"

manifests/servicecert.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
class argus::servicecert inherits argus::params {
2+
$service_name = $::argus::service_name
23
if $service_name == $::fqnd {
34
# we can use the puppet autogenerated certificate
45
class {'hostcertificate::gridcertificate':}

0 commit comments

Comments
 (0)