From d45812d3badc04f7e99fbf4207baf5c45096dc90 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 23 Apr 2021 13:40:50 +0100
Subject: [PATCH] Disable Bifrost cleaning by default

Cleaning was disabled by default in Bifrost
(Ie1198768889bd468176cd68c8ccb48791c724262) until the Victoria release,
when the default was changed. The 'kayobe overcloud provision' command
does not handle cleaning states when moving nodes from manageable to
available. This can lead to provisioning failures.

This change disables cleaning to maintain backwards
compatibility with earlier versions of Kayobe.

Change-Id: I23eb5116d8d1944167a0d50cafe5b99f766ad687
Story: 2008850
Task: 42363
---
 ansible/roles/kolla-bifrost/templates/bifrost.yml.j2       | 4 ++++
 .../notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml   | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml

diff --git a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
index f496766d7..cb1291f12 100644
--- a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
+++ b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
@@ -73,6 +73,10 @@ noauth_mode: true
 # Enable discovery of nodes in Ironic Inspector.
 enable_inspector_discovery: true
 
+# Disable cleaning for backwards compatibility. It is enabled by default in
+# Bifrost since the Victoria release.
+cleaning: false
+
 {% if kolla_bifrost_extra_globals %}
 ###############################################################################
 # Extra configuration
diff --git a/releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml b/releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml
new file mode 100644
index 000000000..f2053217e
--- /dev/null
+++ b/releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Until the Victoria release, Bifrost disabled node cleaning, however it
+    became enabled in Victoria. To maintain backward compatibility, Kayobe now
+    modifies the configuration in Bifrost to disable node cleaning of overcloud
+    hosts.