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

   1 From 6193c304ae187327fadaaa8c4f780135f0f07aa0 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Mon, 30 Mar 2020 12:03:13 +0800
   4 Subject: [PATCH] update_sysinv_database: do not fail if ceph monitor already
   5  configured
   6
   7 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
   8 ---
   9  .../roles/bootstrap/persist-config/tasks/update_sysinv_database.yml   | 4 +++-
  10  1 file changed, 3 insertions(+), 1 deletion(-)
  11
  12 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
  13 index e321710..f4d2185 100644
  14 --- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
  15 +++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
  16 @@ -73,7 +73,9 @@
  17  - name: Fail if populate config script throws an exception
  18    fail:
  19      msg: "Failed to provision initial system configuration."
  20 -  when: populate_result.rc != 0
  21 +  when:
  22 +    - populate_result.rc != 0
  23 +    - '"Ceph monitor already configured" not in populate_result.stderr'
  24
  25  # If this is initial play or replay with management and/or oam network
  26  # config change, must wait for the keystone endpoint runtime manifest
  27 --
  28 2.7.4
  29