Skip to content

Commit cf53abe

Browse files
(MAINT) readd install steps
1 parent 5303c0d commit cf53abe

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

plans/subplans/install.pp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,14 @@
6666
Optional[String] $license_key_content = undef,
6767

6868
# Other
69-
String $stagingdir = '/var/tmp',
70-
String $uploaddir = '/var/tmp',
69+
String $stagingdir = '/tmp',
70+
String $uploaddir = '/tmp',
7171
Peadm::Download_mode $download_mode = 'bolthost',
7272
Boolean $permit_unsafe_versions = false,
7373
String $token_lifetime = '1y',
7474
) {
7575
peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
7676

77-
# output values of stagingdir and uploaddir for debugging purposes
78-
out::message("Using stagingdir ${stagingdir} and uploaddir ${uploaddir}")
79-
8077
# Convert inputs into targets.
8178
$primary_target = peadm::get_targets($primary_host, 1)
8279
$replica_target = peadm::get_targets($replica_host, 1)
@@ -264,7 +261,7 @@
264261
path => $upload_tarball_path,
265262
)
266263
}
267-
/*
264+
268265
# Create csr_attributes.yaml files for the nodes that need them. Ensure that
269266
# if a csr_attributes.yaml file is already present, the values we need are
270267
# merged with the existing values.
@@ -451,7 +448,7 @@
451448
path => '/etc/puppetlabs/enterprise/conf.d/pe.conf',
452449
content => stdlib::to_json_pretty($pe_conf.parsejson() - $puppetdb_database_temp_config),
453450
)
454-
} */
451+
}
455452

456453
return("Installation of Puppet Enterprise ${arch['architecture']} succeeded.")
457454
}

0 commit comments

Comments
 (0)