|
66 | 66 | Optional[String] $license_key_content = undef, |
67 | 67 |
|
68 | 68 | # Other |
69 | | - String $stagingdir = '/var/tmp', |
70 | | - String $uploaddir = '/var/tmp', |
| 69 | + String $stagingdir = '/tmp', |
| 70 | + String $uploaddir = '/tmp', |
71 | 71 | Peadm::Download_mode $download_mode = 'bolthost', |
72 | 72 | Boolean $permit_unsafe_versions = false, |
73 | 73 | String $token_lifetime = '1y', |
74 | 74 | ) { |
75 | 75 | peadm::assert_supported_pe_version($version, $permit_unsafe_versions) |
76 | 76 |
|
77 | | - # output values of stagingdir and uploaddir for debugging purposes |
78 | | - out::message("Using stagingdir ${stagingdir} and uploaddir ${uploaddir}") |
79 | | - |
80 | 77 | # Convert inputs into targets. |
81 | 78 | $primary_target = peadm::get_targets($primary_host, 1) |
82 | 79 | $replica_target = peadm::get_targets($replica_host, 1) |
|
264 | 261 | path => $upload_tarball_path, |
265 | 262 | ) |
266 | 263 | } |
267 | | -/* |
| 264 | + |
268 | 265 | # Create csr_attributes.yaml files for the nodes that need them. Ensure that |
269 | 266 | # if a csr_attributes.yaml file is already present, the values we need are |
270 | 267 | # merged with the existing values. |
|
451 | 448 | path => '/etc/puppetlabs/enterprise/conf.d/pe.conf', |
452 | 449 | content => stdlib::to_json_pretty($pe_conf.parsejson() - $puppetdb_database_temp_config), |
453 | 450 | ) |
454 | | - } */ |
| 451 | + } |
455 | 452 |
|
456 | 453 | return("Installation of Puppet Enterprise ${arch['architecture']} succeeded.") |
457 | 454 | } |
0 commit comments