From 8e127bce07ce0579f7f4e6728410de38de5ecaf1 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Fri, 14 Sep 2018 09:24:27 +0200
Subject: [PATCH] Don't fail ironic upgrade if xinetd isn't present

When upgrading from Rocky to master in CI, we don't seem to have
xinetd present in the overcloud, and attempting to restart it fails
the upgrade. Check if it's running before trying to restart it.

Change-Id: I9f45340cf6caf7811aa03a1b2aa16eec599d4faa
Closes-Bug: #1792527
---
 docker/services/ironic-pxe.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index c255baab53..7f84d5e045 100644
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -95,10 +95,15 @@ outputs:
               file:
                 path: /etc/xinetd.d/tftp
                 state: absent
+            - name: query if xinetd is active
+              failed_when: false
+              shell: systemctl is-active xinetd
+              register: xinetd_active_result
             - name: restart xinetd in order to free tftp port
               service:
                 name: xinetd
                 state: restarted
+              when: xinetd_active_result.rc == 0
         - when: step|int == 3
           block:
             - name: Set fact for removal of tftp-server package