meta-starlingx: remove the upstream layer

[pti/rtp.git] / meta-starlingx / meta-stx-flock / stx-ansible-playbooks / files / 0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch

diff --git a/meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch b/meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch
deleted file mode 100644 (file)
index 903190e..0000000
--- a/meta-starlingx/meta-stx-flock/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6193c304ae187327fadaaa8c4f780135f0f07aa0 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 30 Mar 2020 12:03:13 +0800
-Subject: [PATCH] update_sysinv_database: do not fail if ceph monitor already
- configured
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- .../roles/bootstrap/persist-config/tasks/update_sysinv_database.yml   | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-index e321710..f4d2185 100644
---- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-+++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
-@@ -73,7 +73,9 @@
- - name: Fail if populate config script throws an exception
-   fail:
-     msg: "Failed to provision initial system configuration."
--  when: populate_result.rc != 0
-+  when:
-+    - populate_result.rc != 0
-+    - '"Ceph monitor already configured" not in populate_result.stderr'
- 
- # If this is initial play or replay with management and/or oam network
- # config change, must wait for the keystone endpoint runtime manifest
--- 
-2.7.4
-