diff --git a/plans/convert.pp b/plans/convert.pp index 724e87d3..2642ccd7 100644 --- a/plans/convert.pp +++ b/plans/convert.pp @@ -261,8 +261,9 @@ # the existing groups are correct enough to function until the upgrade is # performed. if (versioncmp($pe_version, '2019.7.0') >= 0) { - out::message('WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:') - run_task('peadm::get_group_rules', $primary_target) + $rules = run_task('peadm::get_group_rules', $primary_target).first.value['_output'] + $rules_formatted = stdlib::to_json_pretty(parsejson($rules)) + out::message("WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:\n ${rules_formatted}") apply($primary_target) { class { 'peadm::setup::node_manager_yaml': diff --git a/plans/upgrade.pp b/plans/upgrade.pp index f254aafd..5d061e0d 100644 --- a/plans/upgrade.pp +++ b/plans/upgrade.pp @@ -326,8 +326,9 @@ default => $primary_postgresql_target.peadm::certname(), } - out::message('WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:') - run_task('peadm::get_group_rules', $primary_target) + $rules = run_task('peadm::get_group_rules', $primary_target).first.value['_output'] + $rules_formatted = stdlib::to_json_pretty(parsejson($rules)) + out::message("WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:\n ${rules_formatted}") apply($primary_target) { class { 'peadm::setup::node_manager_yaml':