From 181111e62de7f0f3fd0d6fd8cd62834f1783f148 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Thu, 13 Jun 2019 13:16:26 +0200
Subject: [PATCH] Disable Leapp when using OOOQ

When using OOOQ, don't enable the Leapp chunks of upgrade workflow yet.

Change-Id: Ia108af3799dfd1be24c6ea738e42f0cde19c90c3
---
 tasks/upgrade/create-overcloud-upgrade-scripts.yaml | 8 ++++++++
 templates/disable-leapp.yaml.j2                     | 2 ++
 templates/overcloud_upgrade_prepare.sh.j2           | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 templates/disable-leapp.yaml.j2

diff --git a/tasks/upgrade/create-overcloud-upgrade-scripts.yaml b/tasks/upgrade/create-overcloud-upgrade-scripts.yaml
index 78c0289f..99e9203d 100644
--- a/tasks/upgrade/create-overcloud-upgrade-scripts.yaml
+++ b/tasks/upgrade/create-overcloud-upgrade-scripts.yaml
@@ -106,6 +106,14 @@
     force: true
   when: upgrade_remove_rpm|bool
 
+- name: create disable-leapp env file
+  template:
+    src: "disable-leapp.yaml.j2"
+    dest: "{{ working_dir }}/disable-leapp.yaml"
+    mode: 0755
+    force: true
+  when: use_oooq|default(false)|bool
+
 - name: import tasks from sh_config_skip_host
   import_tasks: ../common/ssh_config_skip_host.yml
 
diff --git a/templates/disable-leapp.yaml.j2 b/templates/disable-leapp.yaml.j2
new file mode 100644
index 00000000..210207b4
--- /dev/null
+++ b/templates/disable-leapp.yaml.j2
@@ -0,0 +1,2 @@
+parameter_defaults:
+  UpgradeLeappEnabled: false
diff --git a/templates/overcloud_upgrade_prepare.sh.j2 b/templates/overcloud_upgrade_prepare.sh.j2
index ae3a5759..52a8ee25 100644
--- a/templates/overcloud_upgrade_prepare.sh.j2
+++ b/templates/overcloud_upgrade_prepare.sh.j2
@@ -43,6 +43,9 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
     {% if upgrade_remove_rpm|default(false)|bool -%}
     -e {{ working_dir }}/remove-packages.yaml \
     {% endif -%}
+    {% if use_oooq|default(false)|bool -%}
+    -e {{ working_dir }}/disable-leapp.yaml \
+    {% endif -%}
     {% if upgrade_prepare_extra_params -%}
     -e {{ upgrade_prepare_extra_params | join(' -e ') }} \
     {% endif -%}