Reduce several check tasks down to one

functions/wait_until_service_ready.pp

@@ -0,0 +1,16 @@
+# A convenience function to help remember port numbers for services and handle
+# running the wait_until_service_ready task
+function peadm::wait_until_service_ready(
+  String     $service,
+  TargetSpec $target,
+) {
+  $port = case $service {
+    'orchestrator-service': { '8143' }
+    default: { '8140' }
+  }
+
+  run_task('peadm::wait_until_service_ready', $target,
+    service => $service,
+    port    => $port,
+  )
+}

plans/action/install.pp

@@ -330,19 +330,11 @@
     )
   }
 
+  # The puppetserver might be in the middle of a restart after the Puppet run,
+  # so we check the status by calling the api and ensuring the puppetserver is
+  # taking requests before proceeding.
   run_task('peadm::puppet_runonce', $master_target)
-
-  # The puppetserver might be in the middle of a restart so we check the status by calling
-  # the api and ensuring the puppetserver is taking requests.
-  ctrl::do_until('limit' => 10) || {
-    $pe_status = run_task('peadm::check_status', $master_target, service => 'pe-master')
-    if ($pe_status.first['state'] != 'running') {
-      ctrl::sleep(5)
-      false
-    } else {
-      true
-    }
-  }
+  peadm::wait_until_service_ready('pe-master', $master_target)
 
   run_task('peadm::puppet_runonce', $all_targets - $master_target)
 

plans/upgrade.pp

@@ -121,7 +121,7 @@
 
   # If in use, wait until orchestrator service is healthy to proceed
   if $all_targets.any |$target| { $target.protocol == 'pcp' } {
-    run_task('peadm::orchestrator_healthcheck', $master_target)
+    peadm::wait_until_service_ready('orchestrator-service', $master_target)
     wait_until_available($all_targets, wait_time => 120)
   }
 
@@ -135,7 +135,7 @@
   # The master could restart orchestration services again, in which case we
   # would have to wait for nodes to reconnect
   if $all_targets.any |$target| { $target.protocol == 'pcp' } {
-    run_task('peadm::orchestrator_healthcheck', $master_target)
+    peadm::wait_until_service_ready('orchestrator-service', $master_target)
     wait_until_available($all_targets, wait_time => 120)
   }
 

tasks/wait_until_service_ready.json

@@ -0,0 +1,16 @@
+{
+  "description": "Return when the orchestrator service is healthy, or timeout after 15 seconds",
+  "parameters": {
+    "service": {
+      "type": "Enum[all, ca, pe-master, orchestrator-service]",
+      "description": "What service to check. For example: all, pe-master, orchestrator-service"
+    },
+    "port": {
+      "type": "Enum['8140', '8143']",
+      "description": "Which port to query the status API on"
+    }
+  },
+  "implementations": [
+    {"name": "wait_until_service_ready.sh", "input_method": "environment"}
+  ]
+}

tasks/wait_until_service_ready.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+check() {
+  if [[ "$PT_service" == 'all' ]]; then
+    out=$(curl -fks https://localhost:${PT_port}/status/v1/simple)
+  else
+    out=$(curl -fks https://localhost:${PT_port}/status/v1/simple/${PT_service})
+  fi
+}
+
+n=0
+until [ $n -ge 20 ]
+do
+  check && break
+  n=$[$n+1]
+  sleep 3
+done