(PE-38770) Install Plan accepts legacy_compilers key

REFERENCE.md

@@ -137,7 +137,7 @@ Type: Puppet Language
 
 Assert that the architecture given is a supported one
 
-#### `peadm::assert_supported_architecture(TargetSpec $primary_host, Variant[TargetSpec, Undef] $replica_host = undef, Variant[TargetSpec, Undef] $primary_postgresql_host = undef, Variant[TargetSpec, Undef] $replica_postgresql_host = undef, Variant[TargetSpec, Undef] $compiler_hosts = undef)`
+#### `peadm::assert_supported_architecture(TargetSpec $primary_host, Variant[TargetSpec, Undef] $replica_host = undef, Variant[TargetSpec, Undef] $primary_postgresql_host = undef, Variant[TargetSpec, Undef] $replica_postgresql_host = undef, Variant[TargetSpec, Undef] $compiler_hosts = undef, Variant[TargetSpec, Undef] $legacy_compilers = undef)`
 
 The peadm::assert_supported_architecture function.
 
@@ -173,6 +173,12 @@ Data type: `Variant[TargetSpec, Undef]`
 
 
 
+##### `legacy_compilers`
+
+Data type: `Variant[TargetSpec, Undef]`
+
+
+
 ### <a name="peadm--assert_supported_bolt_version"></a>`peadm::assert_supported_bolt_version`
 
 Type: Puppet Language
@@ -1826,6 +1832,7 @@ The following parameters are available in the `peadm::install` plan:
 * [`primary_host`](#-peadm--install--primary_host)
 * [`replica_host`](#-peadm--install--replica_host)
 * [`compiler_hosts`](#-peadm--install--compiler_hosts)
+* [`legacy_compilers`](#-peadm--install--legacy_compilers)
 * [`primary_postgresql_host`](#-peadm--install--primary_postgresql_host)
 * [`replica_postgresql_host`](#-peadm--install--replica_postgresql_host)
 * [`console_password`](#-peadm--install--console_password)
@@ -1942,6 +1949,14 @@ Data type: `Optional[TargetSpec]`
 
 
 
+Default value: `undef`
+
+##### <a name="-peadm--install--legacy_compilers"></a>`legacy_compilers`
+
+Data type: `Optional[TargetSpec]`
+
+
+
 Default value: `undef`
 
 ##### <a name="-peadm--install--primary_postgresql_host"></a>`primary_postgresql_host`

documentation/install.md

@@ -1,69 +1,68 @@
-# Install Puppet Enterprise using the peadm module
+# Install Puppet Enterprise using the PEADM module
 
-The peadm module can be used to install Puppet Enterprise on new infrastructure. Supported architectures include Standard, Large, and Extra Large.
+The PEADM module can be used to install Puppet Enterprise on new infrastructure. Supported architectures include Standard, Large, and Extra Large.
 
-The peadm install plan creates a base install. Once a base cluster is installed, you may need to continue and perform additional configuration and adjustments to reach your target state, depending on your use case.
+The PEADM install plan creates a base install. Once a base cluster is installed, you may need to continue and perform additional configuration and adjustments to reach your target state, depending on your use case.
 
 ## Reference Architectures
 
-When installing a new PE cluster using peadm, there are several different host parameters which can be specified. At a minimum, you must always specify the primary parameter. Depending on which architecture you are deploying, other host parameters may be needed as well. The following is a list of the architectures peadm can install and the required parameters.
-
-* Standard
-    - primary
-* Standard with DR
-    - primary
-    - primary-replica
-* Large
-    - primary
-    - compilers
-* Large with DR
-    - primary
-    - primary-replica
-    - compilers
-* Extra Large
-    - primary
-    - pdb-database
-    - compilers (optional)
-* Extra Large with DR
-    - primary
-    - primary-replica
-    - pdb-database
-    - pdb-database-replica
-    - compilers (optional)
-
-Supplying a combination of host parameters which does not match one of the supported architectures above will result in an unsupported architecture error.
+When installing a new PE cluster using PEADM, several different host parameters can be specified. At a minimum, you must always specify the primary parameter. Depending on which architecture you are deploying, other host parameters may be needed as well. The following is a list of the architectures PEADM can install and the required parameters.
+
+- Standard
+  - primary
+- Standard with DR
+  - primary
+  - primary-replica
+- Large
+  - primary
+  - compilers
+- Large with DR
+  - primary
+  - primary-replica
+  - compilers
+- Extra Large
+  - primary
+  - pdb-database
+  - compilers (optional)
+- Extra Large with DR
+  - primary
+  - primary-replica
+  - pdb-database
+  - pdb-database-replica
+  - compilers (optional)
+
+Supplying a combination of host parameters that do not match one of the supported architectures above will result in an unsupported architecture error.
 
 ## Requirements
 
-* Puppet must not be installed on any of the target PE cluster hosts prior to beginning install.
+Puppet must not be installed on any of the target PE cluster hosts before beginning installation.
 
 ## Usage
 
 ### Bolt 3 usage
+
 We will name the bolt project `large_ha_peadm` in this example but the project name can be anything.
 
 1. Install Bolt on a jumphost. This can be the primary, or any other system. (via package)
 2. Run `mkdir large_ha_peadm && cd large_ha_peadm && bolt project init large_ha_peadm --modules puppetlabs-peadm`
-4. Create an inventory file with connection information. Example included below.
-5. Create a parameters file. Example included below.
-6. Run `bolt plan run peadm::install --params @params.json ` after the inventory and params files are created.
-
+3. Create an inventory file with connection information. Example included below.
+4. Create a parameters file. Example included below.
+5. Run `bolt plan run peadm::install --params @params.json ` after the inventory and params files are created.
 
 ### Bolt 2 usage
 
-1. Install Bolt on a jumphost. This can be the primary, or any other system.
-2. Download or git clone the peadm module and put it somewhere on the jumphost. e.g. ~/modules/peadm.
-3. Download or git clone the module dependencies, and put them somewhere on the jumphost. e.g. ~/modules/stdlib, ~/modules/node\_manager, etc.
-4. Create an inventory file with connection information. Example included below.
-5. Create a parameters file. Example included below.
-6. Run the peadm::install plan with the inputs created. Example:
+1.  Install Bolt on a jumphost. This can be the primary or any other system.
+2.  Download or git clone the PEADM module and put it somewhere on the jumphost. e.g. ~/modules/peadm.
+3.  Download or git clone the module dependencies, and put them somewhere on the jumphost. e.g. ~/modules/stdlib, ~/modules/node_manager, etc.
+4.  Create an inventory file with connection information. Example included below.
+5.  Create a parameters file. Example included below.
+6.  Run the peadm::install plan with the inputs created. Example:
 
         bolt plan run peadm::install \
           --inventory inventory.yaml \
           --modulepath ~/modules \
           --params @params.json
 
-
 Example inventory.yaml Bolt inventory file:
 
 ```yaml
@@ -85,9 +84,13 @@ groups:
         uri: 10.234.6.45
       - name: pe-xl-compiler-1.lab1.puppet.vm
         uri: 10.234.14.131
+      - name: pe-xl-legacy-compiler-0.lab1.puppet.vm
+        uri: 10.234.6.46
+      - name: pe-xl-legacy-compiler-1.lab1.puppet.vm
+        uri: 10.234.6.47
 ```
 
-Example params.json Bolt parameters file (shown: Extra Large with DR):
+example params.json bolt parameters file (shown: extra large with dr):
 
 ```json
 {
@@ -99,9 +102,12 @@ Example params.json Bolt parameters file (shown: Extra Large with DR):
     "pe-xl-compiler-0.lab1.puppet.vm",
     "pe-xl-compiler-1.lab1.puppet.vm"
   ],
-
+  "legacy_compilers": [
+    "pe-xl-legacy-compiler-0.lab1.puppet.vm",
+    "pe-xl-legacy-compiler-1.lab1.puppet.vm"
+  ],
   "console_password": "puppetlabs",
-  "dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
+  "dns_alt_names": ["puppet", "puppet.lab1.puppet.vm"],
   "compiler_pool_address": "puppet.lab1.puppet.vm",
   "version": "2021.7.0"
 }
@@ -113,41 +119,40 @@ Example params.json Bolt parameters file (shown: Standard):
 {
   "primary_host": "pe-xl-core-0.lab1.puppet.vm",
   "console_password": "puppetlabs",
-  "dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
+  "dns_alt_names": ["puppet", "puppet.lab1.puppet.vm"],
   "version": "2021.7.8"
 }
 ```
 
-Review the [peadm::install plan](../plans/install.pp) to learn about more advanced installation options. For example, it is possible to: supply an ssh private key and git clone URL for a control-repo as part of installation; supply the LDAP configuration data for PE; specify where the installer tarball is uploaded; and similar complete automation tie-ins.
+Review the [peadm::install plan](../plans/install.pp) to learn about more advanced installation options. For example, it is possible to: supply an SSH private key and git clone URL for a control-repo as part of installation; supply the LDAP configuration data for PE; specify where the installer tarball is uploaded; and similar complete automation tie-ins.
 
 ## Offline usage
 
 The peadm::install 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 on the Bolt host. If content is available in the staging directory, peadm::install 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::install 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-2021.4.0-el-7-x86_64.tar.gz`.
+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-2021.4.0-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/).
 
-If you wish to prevent the bolt host from transferring the installer tarball to the targets you can place the installer tar files on the target hosts in the _upload directory_. This can save time over slow networks, but is best to just perform the bolt task on the target node (puppetserver). The default _upload directory_ is `/tmp`. If a different upload dir is being used, it can be specified using the `uploaddir` parameter to the peadm::install plan. With default parameters the tar file will need to exist in the directories for offline configuration:
+If you wish to prevent the bolt host from transferring the installer tarball to the targets you can place the installer tar files on the target hosts in the _upload directory_. This can save time over slow networks, but is best to just perform the bolt task on the target node (puppetserver). The default _upload directory_ is `/tmp`. If a different upload dir is being used, it can be specified using the `uploaddir` parameter to the peadm::install plan. With default parameters, the tar file will need to exist in the directories for offline configuration:
 
-* /tmp on the Bolt host
-* /tmp on the primary
-* /tmp on the primary PuppetDB PostgreSQL (if used)
-* /tmp on the replica PuppetDB PostgreSQL (if used)
+- /tmp on the Bolt host
+- /tmp on the primary
+- /tmp on the primary PuppetDB PostgreSQL (if used)
+- /tmp on the replica PuppetDB PostgreSQL (if used)
 
 ## Online usage
 
-The peadm::install plan can be configured to download installation content directly to hosts. To configure online installation, set the `download_mode` parameter of the `peadm::install` plan to `direct`. The direct mode is often more efficient when PE hosts have a route to the internet.
+The peadm::install plan can be configured to download installation content directly to hosts. To configure the online installation, set the `download_mode` parameter of the `peadm::install` plan to `direct`. The direct mode is often more efficient when PE hosts have a route to the internet.
 
 ## Hostnames and Certificate Names
 
 The various host parameters given to the peadm::install or peadm::action::install plans will be set as Puppet certificate names. You must use the names here that you want the servers to be identified as by Puppet.
 
 While it is not required that target names match hostnames, it _is_ required that target names be resolvable.
-
-In the event that Bolt will reach servers by IP address or external DNS name rather than internal DNS name or desired certname, a Bolt inventory file should be used to specify URIs for each name. For example:
+If Bolt will reach servers by IP address or external DNS name rather than internal DNS name or desired certname, a Bolt inventory file should be used to specify URIs for each name. For example:
 
 ```yaml
 ---
@@ -158,28 +163,27 @@ targets:
     uri: 10.234.14.131
 ```
 
-A parameters JSON file can then reference the target names, which will become the Puppet certificate names, and Bolt will still be able to reach the systems by using the IP addresses or other DNS name specified as the URIs in the inventory.yaml file.
+A parameters JSON file can then reference the target names, which will become the Puppet certificate names, and Bolt will still be able to reach the systems by using the IP addresses or other DNS names specified as the URIs in the inventory.yaml file.
 
 ```json
 {
   "primary_host": "pe-xl-core-0.lab1.puppet.vm",
   "replica_host": "pe-xl-core-1.lab1.puppet.vm",
 
   "console_password": "puppetlabs",
-  "dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
+  "dns_alt_names": ["puppet", "puppet.lab1.puppet.vm"],
   "compiler_pool_address": "puppet.lab1.puppet.vm",
   "version": "2021.7.0"
 }
 ```
 
 ## Implementation Reference
 
-Provisioning can be broken down into two actions: [install](../plans/action/install.pp), and [configure](../plans/subplans/configure.pp). Installation currently requires ssh access to the un-installed nodes, but configure can be performed using the Orchestrator transport if installation has already been completed.
-
-Besides getting Puppet Enterprise installed, the key configuration supporting Large and Extra Large architectures is laid out in four classification groups. Links are provided below to a Markdown document that describes the groups, and also to the Puppet manifest that actually configures them:
+Provisioning can be broken down into two actions: [install](../plans/action/install.pp), and [configure](../plans/subplans/configure.pp). The installation currently requires SSH access to the uninstalled nodes, but configuration can be performed using the Orchestrator transport if the installation has already been completed.
 
-* [classification.md](classification.md)
-* [peadm::setup::node\_manager class](../manifests/setup/node_manager.pp)
+Besides getting Puppet Enterprise installed, the key configuration supporting Large and Extra-large architectures is laid out in four classification groups. Links are provided below to a Markdown document that describes the groups, and also to the Puppet manifest that configures them:
 
-The reference implementation uses trusted facts to put nodes in the right groups. Because the important puppet\_enterprise::\* class parameters and data are specified in the console, it should also be safe to have a pe.conf present on both the primary, and the primary replica nodes.
+- [classification.md](classification.md)
+- [peadm::setup::node_manager class](../manifests/setup/node_manager.pp)
 
+The reference implementation uses trusted facts to put nodes in the right groups. Because the important puppet_enterprise::\* class parameters and data are specified in the console, it should also be safe to have a pe.conf present on both the primary and the primary replica nodes.

functions/assert_supported_architecture.pp

@@ -5,21 +5,45 @@ function peadm::assert_supported_architecture (
   Variant[TargetSpec, Undef] $primary_postgresql_host = undef,
   Variant[TargetSpec, Undef] $replica_postgresql_host = undef,
   Variant[TargetSpec, Undef] $compiler_hosts = undef,
+  Variant[TargetSpec, Undef] $legacy_compilers = undef,
 )  >> Hash {
+  # Normalize $legacy_compilers to an array
+  $legacy_compilers_array = $legacy_compilers ? {
+    undef   => [],
+    String  => [$legacy_compilers],
+    Array   => $legacy_compilers,
+    default => fail("Unexpected type for \$legacy_compilers: ${legacy_compilers}"),
+  }
+
+  # Normalize $compiler_hosts to an array
+  $compiler_hosts_array = $compiler_hosts ? {
+    undef   => [],
+    String  => [$compiler_hosts],
+    Array   => $compiler_hosts,
+    default => fail("Unexpected type for \$compiler_hosts: ${compiler_hosts}"),
+  }
+  $all_compilers = $legacy_compilers_array + $compiler_hosts_array
+
+  # Set $has_compilers to undef if $all_compilers is empty, otherwise set it to true
+  $has_compilers = empty($all_compilers) ? {
+    true    => undef,
+    default => true,
+  }
+
   $result = case [
     !!($primary_host),
     !!($replica_host),
     !!($primary_postgresql_host),
     !!($replica_postgresql_host),
   ] {
     [true, false, false, false]: { # Standard or Large, no DR
-      ({ 'disaster-recovery' => false, 'architecture' => $compiler_hosts ? {
+      ({ 'disaster-recovery' => false, 'architecture' => $has_compilers ? {
             undef   => 'standard',
             default => 'large',
       } })
     }
     [true, true, false, false]: { # Standard or Large, DR
-      ({ 'disaster-recovery' => true, 'architecture' => $compiler_hosts ? {
+      ({ 'disaster-recovery' => true, 'architecture' => $has_compilers ? {
             undef   => 'standard',
             default => 'large',
       } })
@@ -44,7 +68,7 @@ function peadm::assert_supported_architecture (
         <% if $replica_postgresql_host { -%>
           - pdb-database-replica
         <% } -%>
-        <% if $compiler_hosts { -%>
+        <% if $has_compilers { -%>
           - compilers
         <% } -%>