X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-ansible-playbooks%2Ffiles%2F0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-ansible-playbooks%2Ffiles%2F0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=903190e30a0cbc449b2b45b9411db0897b3f23e3;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git 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 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 -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 ---- - .../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 -