Merge pull request #61 from abrader/serveng-24-license-file

Manage license file

Author: reidmv

functions/file_or_content.pp

@@ -0,0 +1,19 @@
+function peadm::file_or_content(
+  String $param_name,
+  String $file,
+  String $content,
+) {
+
+  $value = [
+    $file,
+    $content,
+  ].peadm::flatten_compact.size ? {
+    0 => undef, # no key data supplied
+    2 => fail("Must specify either one or neither of ${param_name}_file and ${param_name}_content; not both"),
+    1 => $file ? {
+      String  => file($file), # file path supplied, read data from file
+      undef   => $content,    # content supplied directly, use as-is
+    },
+  }
+
+}

plans/action/install.pp

@@ -9,6 +9,11 @@
 #   over to the masters at /etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa
 #   If the file does not exist the value will simply be supplied to the masters
 #
+# @param license_key
+#   The license key to use with Puppet Enterprise.  If this is a local file it
+#   will be copied over to the MoM at /etc/puppetlabs/license.key
+#   If the file does not exist the value will simply be supplied to the masters
+#
 # @param pe_conf_data
 #   Config data to plane into pe.conf when generated on all hosts, this can be
 #   used for tuning data etc.
@@ -36,6 +41,10 @@
   Optional[String]     $r10k_private_key_file    = undef,
   Optional[Peadm::Pem] $r10k_private_key_content = undef,
 
+  # License key
+  Optional[String]     $license_key_file    = undef,
+  Optional[String]     $license_key_content = undef,
+
   # Other
   String               $stagingdir   = '/tmp',
 ) {
@@ -91,20 +100,13 @@
 
   $dns_alt_names_csv = $dns_alt_names.reduce |$csv,$x| { "${csv},${x}" }
 
-  # Process user input for r10k private key (content or file) and set
+  # Process user input for r10k private key (file or content) and set
   # appropriate value in $r10k_private_key. The value of this variable should
   # either be undef or else the key content to write.
-  $r10k_private_key = [
-    $r10k_private_key_file,
-    $r10k_private_key_content,
-  ].peadm::flatten_compact.size ? {
-    0 => undef, # no key data supplied
-    2 => fail('Must specify either one or neither of r10k_private_key_file and r10k_private_key_content; not both'),
-    1 => $r10k_private_key_file ? {
-      String => file($r10k_private_key_file), # key file path supplied, read data from file
-      undef  => $r10k_private_key_content,    # key content supplied directly, use as-is
-    },
-  }
+  $r10k_private_key = peadm::file_or_content('r10k_private_key', $r10k_private_key_file, $r10k_private_key_content)
+
+  # Same for license key
+  $license_key = peadm::file_or_content('license_key', $license_key_file, $license_key_content)
 
   $precheck_results = run_task('peadm::precheck', $all_targets)
   $platform = $precheck_results.first['platform'] # Assume the platform of the first result correct
@@ -212,7 +214,10 @@
   }
 
   if $r10k_private_key {
-    run_task('peadm::mkdir_p_file', [$master_target, $master_replica_target],
+    run_task('peadm::mkdir_p_file', peadm::flatten_compact([
+      $master_target,
+      $master_replica_target,
+    ]),
       path    => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
       owner   => 'pe-puppet',
       group   => 'pe-puppet',
@@ -221,6 +226,19 @@
     )
   }
 
+  if $license_key {
+    run_task('peadm::mkdir_p_file', peadm::flatten_compact([
+      $master_target,
+      $master_replica_target,
+    ]),
+      path    => '/etc/puppetlabs/license.key',
+      owner   => 'pe-puppet',
+      group   => 'pe-puppet',
+      mode    => '0400',
+      content => $license_key,
+    )
+  }
+
   # Configure autosigning for the puppetdb database hosts 'cause they need it
   $autosign_conf = $database_targets.reduce('') |$memo,$target| { "${target.name}\n${memo}" }
   run_task('peadm::mkdir_p_file', $master_target,

plans/provision.pp

@@ -27,6 +27,10 @@
   Optional[Peadm::Pem]              $r10k_private_key_content = undef,
   Optional[String]                  $deploy_environment       = undef,
 
+  # License Key
+  Optional[String]                  $license_key_file    = undef,
+  Optional[String]                  $license_key_content = undef,
+
   # Other
   Optional[String]                  $stagingdir = undef,
 ) {
@@ -54,6 +58,10 @@
     r10k_private_key_file          => $r10k_private_key_file,
     r10k_private_key_content       => $r10k_private_key_content,
 
+    # License Key
+    license_key_file               => $license_key_file,
+    license_key_content            => $license_key_content,
+
     # Other
     stagingdir                     => $stagingdir,
   )
@@ -81,3 +89,4 @@
   # Return a string banner reporting on what was done
   return([$install_result, $configure_result])
 }
+