Revert removal of Bolt GH-1244 workaround

Seems like the workaround is still needed. Will investigate, since Bolt
GH-1244 is supposed to be resolved.

Author: reidmv

plans/action/configure.pp

@@ -59,6 +59,17 @@
 
   # Set up the console node groups to configure the various hosts in their roles
 
+  # Pending resolution of Bolt GH-1244, Target objects and their methods are
+  # not accessible inside apply() blocks. Work around the limitation for now
+  # by using string variables calculated outside the apply block. The
+  # commented-out values should be used once GH-1244 is resolved.
+
+  # WORKAROUND: GH-1244
+  $master_host_string = $master_target.peadm::target_name()
+  $master_replica_host_string = $master_replica_target.peadm::target_name()
+  $puppetdb_database_host_string = $puppetdb_database_target.peadm::target_name()
+  $puppetdb_database_replica_host_string = $puppetdb_database_replica_target.peadm::target_name()
+
   apply($master_target) {
     # Necessary to give the sandboxed Puppet executor the configuration
     # necessary to connect to the classifier`
@@ -67,15 +78,16 @@
       mode    => '0644',
       path    => Deferred('peadm::node_manager_yaml_location'),
       content => epp('peadm/node_manager.yaml.epp', {
-        server => $master_target.peadm::target_name(),
+        server => $master_host_string,
       }),
     }
 
     class { 'peadm::setup::node_manager':
-      master_host                    => $master_target.peadm::target_name(),
-      master_replica_host            => $master_replica_target.peadm::target_name(),
-      puppetdb_database_host         => $puppetdb_database_target.peadm::target_name(),
-      puppetdb_database_replica_host => $puppetdb_database_replica_target.peadm::target_name(),
+      # WORKAROUND: GH-1244
+      master_host                    => $master_host_string, # $master_target.peadm::target_name(),
+      master_replica_host            => $master_replica_host_string, # $master_replica_target.peadm::target_name(),
+      puppetdb_database_host         => $puppetdb_database_host_string, # $puppetdb_database_target.peadm::target_name(),
+      puppetdb_database_replica_host => $puppetdb_database_replica_host_string, # $puppetdb_database_replica_target.peadm::target_name(),
       compiler_pool_address          => $compiler_pool_address,
       require                        => File['node_manager.yaml'],
     }