From b0519479c19766e23c82a21a4b476b350f096941 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Tue, 7 May 2019 16:26:19 +0200
Subject: [PATCH] Add operating system upgrade preparation via Leapp

Also make sure pacemaker cluster is not only stopped but also
destroyed on the node being upgraded. This is a prerequisite for
upgrades via Leapp, otherwise Leapp would assume we expect it to
upgrade the cluster, and it would fail on validation.

Change-Id: I8cf3e4cf294fee3b71473e2343ad16b184fac665
---
 .../pacemaker/pacemaker-baremetal-puppet.yaml |  2 +
 .../tripleo-packages-baremetal-puppet.yaml    | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index cb44ffed42..963c668bbe 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -152,6 +152,8 @@ outputs:
           block:
             - name: Stop pacemaker cluster
               pacemaker_cluster: state=offline
+            - name: destroy pacemaker cluster
+              command: /usr/sbin/pcs cluster destroy
         - name: Check pacemaker cluster running before upgrade
           when: step|int == 0
           tags: validation
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index f073b689b2..11b5916a37 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -51,6 +51,18 @@ parameters:
       echo "and passed the upstream name (ocata, pike, queens) of the release as first argument"
       exit 1
     type: string
+  UpgradeLeappEnabled:
+    description: Use Leapp for operating system upgrade
+    type: boolean
+    default: true
+  UpgradeLeappDebug:
+    description: Print debugging output when running Leapp
+    type: boolean
+    default: true
+  UpgradeLeappRebootTimeout:
+    description: Timeout (seconds) for the OS upgrade phase via Leapp
+    type: number
+    default: 1800
   UpgradeInitCommand:
     type: string
     description: |
@@ -76,6 +88,37 @@ outputs:
       step_config: |
         include ::tripleo::packages
       upgrade_tasks:
+        - name: set leapp facts
+          tags: always
+          set_fact:
+            upgrade_leapp_enabled: {get_param: UpgradeLeappEnabled}
+            upgrade_leapp_debug: {get_param: UpgradeLeappDebug}
+            upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
+        - name: system_upgrade_prepare step 3
+          tags:
+            - never
+            - system_upgrade_prepare
+          when: step|int == 3
+          block:
+            - name: install leapp
+              package:
+                name: leapp
+                state: latest
+              when: upgrade_leapp_enabled
+            - name: run leapp upgrade (download packages)
+              shell: |
+                leapp upgrade {{ '--debug' if upgrade_leapp_debug|default(true) else '' }}
+              when: upgrade_leapp_enabled
+        - name: system_upgrade_run step 5
+          tags:
+            - never
+            - system_upgrade_run
+          when: step|int == 5
+          block:
+            - name: reboot to perform the upgrade
+              reboot:
+                reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"
+              when: upgrade_leapp_enabled
         - name: Package and repo update tasks
           when: step|int == 0
           block: