Merge pull request #54 from puppetlabs/ubuntu

Add support for Ubuntu platform

Author: reidmv

Diff for: documentation/basic_usage.md

@@ -74,3 +74,13 @@ Example params.json Bolt parameters file:
   "version": "2019.1.1"
 }
 ```
+
+## Offline usage
+
+The peadm::provision plan downloads installation content from an online repository by default. To perform an offline installation, you can prefetch the needed content and place it in the staging directory. If content is available in the staging directory, peadm::provision will not try to download it.
+
+The default staging directory is `/tmp`. If a different staging dir is being used, it can be specified using the `stagingdir` parameter to the peadm::provision plan.
+
+The content needed is the PE installation tarball for the target version. The installation content should be in the staging dir, and should have its original name. E.g. `/tmp/puppet-enterprise-2019.2.2-el-7-x86_64.tar.gz`.
+
+Installation content can be downloaded from [https://puppet.com/try-puppet/puppet-enterprise/download/](https://puppet.com/try-puppet/puppet-enterprise/download/).

Diff for: plans/action/install.pp

@@ -106,12 +106,18 @@
     },
   }
 
+  $precheck_results = run_task('peadm::precheck', $all_targets)
+  $platform = $precheck_results.first['platform'] # Assume the platform of the first result correct
+
   # Validate that the name given for each system is both a resolvable name AND
-  # the configured hostname.
-  run_task('peadm::hostname', $all_targets).each |$result| {
+  # the configured hostname, and that all systems return the same platform
+  $precheck_results.each |$result| {
     if $result.target.name != $result['hostname'] {
       fail_plan("Hostname / DNS name mismatch: target ${result.target.name} reports '${result['hostname']}'")
     }
+    if $result['platform'] != $platform {
+      fail_plan("Platform mismatch: target ${result.target.name} reports '${result['platform']}; expected ${platform}'")
+    }
   }
 
   # Generate all the needed pe.conf files
@@ -143,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}-el-7-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}-el-7-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/enable_replica.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-USER="${USER:-$(id -un)}"
-HOME="${HOME:-$(getent passwd "$USER" | cut -d : -f 6)}"
+USER=$(id -un)
+HOME=$(getent passwd "$USER" | cut -d : -f 6)
 
 if [ -z "$PT_token_file" -o "$PT_token_file" = "null" ]; then
   TOKEN_FILE="${HOME}/.puppetlabs/token"

Diff for: tasks/hostname.json

@@ -0,0 +1,8 @@
+{
+  "description": "Return pre-check information about a system",
+  "parameters": { },
+  "input_method": "environment",
+  "implementations": [
+    {"name": "precheck.sh"}
+  ]
+}

Diff for: tasks/hostname.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+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}-${arch}"
+  }
+EOS

Diff for: tasks/precheck.json

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-USER="${USER:-$(id -un)}"
-HOME="${HOME:-$(getent passwd "$USER" | cut -d : -f 6)}"
+USER=$(id -un)
+HOME=$(getent passwd "$USER" | cut -d : -f 6)
 
 if [ -z "$PT_token_file" -o "$PT_token_file" = "null" ]; then
   TOKEN_FILE="${HOME}/.puppetlabs/token"

Diff for: tasks/precheck.sh

@@ -6,5 +6,8 @@
       "description": "Path to the file to read"
     }
   },
-  "input_method": "environment"
+  "input_method": "stdin",
+  "implementations": [
+    {"name": "read_file.rb"}
+  ]
 }

Diff for: tasks/provision_replica.sh

@@ -0,0 +1,9 @@
+#!/opt/puppetlabs/puppet/bin/ruby
+
+require 'json'
+
+params  = JSON.parse(STDIN.read)
+content = File.read(params['path'])
+result  = { 'content' => content }.to_json
+
+puts result