Fix Ubuntu-related architecture filename

Author: reidmv

Diff for: plans/action/install.pp

@@ -149,12 +149,12 @@
   peadm::file_content_upload($puppetdb_database_replica_pe_conf, '/tmp/pe.conf', $puppetdb_database_replica_target)
 
   # Download the PE tarball and send it to the nodes that need it
-  $pe_tarball_name     = "puppet-enterprise-${version}-${platform}-x86_64.tar.gz"
+  $pe_tarball_name     = "puppet-enterprise-${version}-${platform}.tar.gz"
   $local_tarball_path  = "${stagingdir}/${pe_tarball_name}"
   $upload_tarball_path = "/tmp/${pe_tarball_name}"
 
   run_plan('peadm::util::retrieve_and_upload', $pe_installer_targets,
-    source      => "https://s3.amazonaws.com/pe-builds/released/${version}/puppet-enterprise-${version}-${platform}-x86_64.tar.gz",
+    source      => "https://s3.amazonaws.com/pe-builds/released/${version}/puppet-enterprise-${version}-${platform}.tar.gz",
     local_path  => $local_tarball_path,
     upload_path => $upload_tarball_path,
   )

Diff for: tasks/precheck.sh

@@ -3,11 +3,15 @@
 hostname=$(hostname -f)
 osfamily=$(cat /etc/os-release | grep -qi ubuntu && echo "ubuntu" || echo "el")
 version=$(grep VERSION_ID /etc/os-release | cut -d '"' -f 2)
+arch=$(uname -m)
+
+# Because 64-bit Ubuntu wanted to be special.
+[ "$osfamily" = "ubuntu" -a "$arch" = "x86_64" ] && arch="amd64"
 
 # Output a JSON result for ease of Task usage in Puppet Task Plans
 cat <<EOS
   {
     "hostname": "${hostname}",
-    "platform": "${osfamily}-${version}"
+    "platform": "${osfamily}-${version}-${arch}"
   }
 EOS