From bef04715baa5242988cf6e946f36bc801a089028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Wed, 25 Jul 2018 14:13:55 +0200
Subject: [PATCH] Remove tftp service and package upon upgrade to container

In non-containerized over/undercloud, the tftpd service is
supervised by xinetd.
If we don't deactivate tftpd from xinetd, the UDP:69 port
will still be in use, preventing the containerized tftpd
service to start.

Change-Id: Ibf2decaaaedda9a3b44f28786a5ab9b7415a3907
Closes-bug: 1783547
(cherry picked from commit 149ca6e1634de629a90026a547f301c59555725f)
---
 docker/services/ironic-pxe.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index 1f02e54e2a..51e40f2daa 100644
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -36,6 +36,10 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  UpgradeRemoveUnusedPackages:
+    default: false
+    description: Remove package if the service is being disabled during upgrade
+    type: boolean
 
 resources:
 
@@ -83,6 +87,29 @@ outputs:
             - path: /var/lib/ironic
               owner: ironic:ironic
               recurse: true
+      upgrade_tasks:
+        - when: step|int == 0
+          tags: common
+          block:
+            - name: drop tftp from xinetd supervision
+              file:
+                path: /etc/xinetd.d/tftp
+                state: absent
+            - name: restart xinetd in order to free tftp port
+              service:
+                name: xinetd
+                state: restarted
+        - when: step|int == 3
+          block:
+            - name: Set fact for removal of tftp-server package
+              set_fact:
+                remove_tftp_server: {get_param: UpgradeRemoveUnusedPackages}
+            - name: remove tftp-server if requested
+              ignore_errors: True
+              when: remove_tftp_server|bool
+              package:
+                name: tftp-server
+                state: removed
       docker_config:
         step_4:
           ironic_pxe_tftp: