From a21cc994dd0fe67c50716d153afbd6bb81ae4fbd Mon Sep 17 00:00:00 2001 From: David Mallon Date: Tue, 21 Oct 2025 13:38:33 +0100 Subject: [PATCH] (PE-41637) change order Convert does final puppet runs --- plans/convert.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plans/convert.pp b/plans/convert.pp index 585575b1e..a18928937 100644 --- a/plans/convert.pp +++ b/plans/convert.pp @@ -343,10 +343,11 @@ peadm::plan_step('finalize') || { # Run Puppet on all targets to ensure catalogs and exported resources fully - # up-to-date. Run on primary first in case puppet server restarts, 'cause - # that would cause the runs to fail on all the rest. - run_task('peadm::puppet_runonce', $primary_target) + # up-to-date. + peadm::wait_until_service_ready('pe-master', $primary_target) run_task('peadm::puppet_runonce', $all_targets - $primary_target) + peadm::wait_until_service_ready('pe-master', $primary_target) + run_task('peadm::puppet_runonce', $primary_target) # Restart cluster compiler services that are likely not restarted by our # final Puppet run to increase chance everything is functional upon plan