File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed
Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 149149 peadm::file_content_upload($puppetdb_database_replica_pe_conf , ' /tmp/pe.conf' , $puppetdb_database_replica_target )
150150
151151 # Download the PE tarball and send it to the nodes that need it
152- $pe_tarball_name = " puppet-enterprise-${version} -${platform} -x86_64 .tar.gz"
152+ $pe_tarball_name = " puppet-enterprise-${version} -${platform} .tar.gz"
153153 $local_tarball_path = " ${stagingdir} /${pe_tarball_name} "
154154 $upload_tarball_path = " /tmp/${pe_tarball_name} "
155155
156156 run_plan(' peadm::util::retrieve_and_upload' , $pe_installer_targets ,
157- source => " https://s3.amazonaws.com/pe-builds/released/${version} /puppet-enterprise-${version} -${platform} -x86_64 .tar.gz" ,
157+ source => " https://s3.amazonaws.com/pe-builds/released/${version} /puppet-enterprise-${version} -${platform} .tar.gz" ,
158158 local_path => $local_tarball_path ,
159159 upload_path => $upload_tarball_path ,
160160 )
Original file line number Diff line number Diff line change 33hostname=$( hostname -f)
44osfamily=$( cat /etc/os-release | grep -qi ubuntu && echo " ubuntu" || echo " el" )
55version=$( grep VERSION_ID /etc/os-release | cut -d ' "' -f 2)
6+ arch=$( uname -m)
7+
8+ # Just because.
9+ if [ " $osfamily " = " ubuntu" -a " $arch " = " x86_64" ];
10+ arch=" amd64"
11+ fi
612
713# Output a JSON result for ease of Task usage in Puppet Task Plans
814cat << EOS
915 {
1016 "hostname": "${hostname} ",
11- "platform": "${osfamily} -${version} "
17+ "platform": "${osfamily} -${version} - ${arch} "
1218 }
1319EOS
You can’t perform that action at this time.
0 commit comments