Convert two functions to plans

Really, they were already plans. This makes it obvious that they are
when using them in other plans.

Author: reidmv

Diff for: functions/install_module.pp

@@ -30,8 +30,16 @@
 
   # Retrieve and deploy Puppet modules from the Forge so that they can be used
   # for ensuring some configuration (node groups)
-  pe_xl::install_module($master_target, 'WhatsARanjit-node_manager', '0.7.1', $stagingdir)
-  pe_xl::install_module($master_target, 'puppetlabs-stdlib', '5.0.0', $stagingdir)
+  [ ['WhatsARanjit-node_manager', '0.7.1'],
+    ['puppetlabs-stdlib',         '5.0.0'],
+  ].each |$tuple| {
+    run_plan('pe_xl::util::install_module',
+      nodes      => $master_target,
+      module     => $tuple[0],
+      version    => $tuple[1],
+      stagingdir => $stagingdir,
+    )
+  }
 
   # Set up the console node groups to configure the various hosts in their
   # roles

Diff for: plans/configure.pp

@@ -85,11 +85,11 @@
   $local_tarball_path  = "${stagingdir}/${pe_tarball_name}"
   $upload_tarball_path = "/tmp/${pe_tarball_name}"
 
-  pe_xl::retrieve_and_upload(
-    "https://s3.amazonaws.com/pe-builds/released/${version}/puppet-enterprise-${version}-el-7-x86_64.tar.gz",
-    $local_tarball_path,
-    $upload_tarball_path,
-    [$master_host, $puppetdb_database_host, $puppetdb_database_replica_host]
+  run_plan('pe_xl::util::retrieve_and_upload',
+    nodes       => [$master_host, $puppetdb_database_host, $puppetdb_database_replica_host],
+    source      => "https://s3.amazonaws.com/pe-builds/released/${version}/puppet-enterprise-${version}-el-7-x86_64.tar.gz",
+    local_path  => $local_tarball_path,
+    upload_path => $upload_tarball_path,
   )
 
   # Create csr_attributes.yaml files for the nodes that need them

Diff for: plans/install.pp

@@ -0,0 +1,29 @@
+plan pe_xl::util::install_module(
+  TargetSpec $nodes,
+  String[1]  $module,
+  String[1]  $version,
+  String[1]  $stagingdir = '/tmp',
+) {
+
+  $module_tarball = "${module.regsubst('/', '-')}-${version}.tar.gz"
+
+  run_plan('pe_xl::util::retrieve_and_upload',
+    nodes       => $nodes,
+    source      => "https://forge.puppet.com/v3/files/${module_tarball}",
+    local_path  => "${stagingdir}/${module_tarball}",
+    upload_path => "/tmp/${module_tarball}",
+  )
+
+  run_command(@("HEREDOC"), $nodes)
+    /opt/puppetlabs/bin/puppet module install \
+      --modulepath /etc/puppetlabs/code-staging/environments/production/modules \
+      --ignore-dependencies \
+      /tmp/${module_tarball}
+    | HEREDOC
+
+  run_command('chown -R pe-puppet:pe-puppet /etc/puppetlabs/code-staging', $nodes)
+  run_task('pe_xl::code_manager', $nodes,
+    action => 'commit',
+  )
+
+}

Diff for: plans/util/install_module.pp

@@ -1,8 +1,8 @@
-function pe_xl::retrieve_and_upload(
-  $source,
-  $local_path,
-  $upload_path,
-  $target,
+plan pe_xl::util::retrieve_and_upload(
+  TargetSpec $nodes,
+  String[1]  $source,
+  String[1]  $local_path,
+  String[1]  $upload_path,
 ) {
   $exists = without_default_logging() || {
     run_command("test -e '${local_path}'", 'local://localhost',
@@ -21,7 +21,7 @@ function pe_xl::retrieve_and_upload(
     path => $local_path,
   ).first['size']
 
-  $targets_needing_file = run_task('pe_xl::filesize', $target,
+  $targets_needing_file = run_task('pe_xl::filesize', $nodes,
     path => $upload_path,
   ).filter |$result| {
     $result['size'] != $local_size