(PE-39789) updates to other files

Author: davidmalloncares

functions/get_node_group_environment.pp

@@ -7,6 +7,8 @@
 #
 # @see https://www.puppet.com/docs/pe/latest/upgrade_pe#update_environment
 #
+# @author Tim Meusel <tim@bastelfreak.de>
+#
 function peadm::get_node_group_environment(Peadm::SingleTargetSpec $primary) {
   $peconf = peadm::get_pe_conf(get_target($primary))
   # if both are set, they need to be set to the same value

manifests/setup/legacy_compiler_group.pp

@@ -3,9 +3,11 @@
   String[1] $primary_host,
   Optional[String] $internal_compiler_a_pool_address = undef,
   Optional[String] $internal_compiler_b_pool_address = undef,
+  String[1] $node_group_environment = 'production',
 ) {
   Node_group {
     purge_behavior => none,
+    environment => $node_group_environment,
   }
 
   node_group { 'PE Legacy Compiler':

plans/convert_compiler_to_legacy.pp

@@ -3,6 +3,7 @@
   Peadm::SingleTargetSpec $primary_host,
   TargetSpec              $legacy_hosts,
   Optional[Boolean]       $remove_pdb = true,
+  String[1] $node_group_environment = peadm::get_node_group_environment($primary_host),
 ) {
   $primary_target            = peadm::get_targets($primary_host, 1)
   $convert_legacy_compiler_targets   = peadm::get_targets($legacy_hosts)
@@ -34,6 +35,7 @@
       },
       internal_compiler_a_pool_address => getvar('cluster.params.internal_compiler_a_pool_address'),
       internal_compiler_b_pool_address => getvar('cluster.params.internal_compiler_b_pool_address'),
+      node_group_environment           => $node_group_environment,
       require                          => Class['peadm::setup::node_manager_yaml'],
     }
   }

plans/install.pp

@@ -85,6 +85,7 @@
     'legacy_compilers' => $legacy_compilers,
     'primary_postgresql_host' => $primary_postgresql_host,
     'replica_postgresql_host' => $replica_postgresql_host,
+    'node_group_environment' => $node_group_environment,
     'version' => $version,
   })
 

plans/upgrade.pp

@@ -71,6 +71,7 @@
     'compiler_hosts' => $compiler_hosts,
     'primary_postgresql_host' => $primary_postgresql_host,
     'replica_postgresql_host' => $replica_postgresql_host,
+    'node_group_environment' => $node_group_environment,
     'version' => $version,
   })