X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-core%2Fstx-ansible-playbooks%2Ffiles%2F0005-persist-config-add-retry-for-etcd.patch;fp=meta-stx%2Frecipes-core%2Fstx-ansible-playbooks%2Ffiles%2F0005-persist-config-add-retry-for-etcd.patch;h=fd00b14db5600b53db1039ddc0b70e856f022288;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-core/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch b/meta-stx/recipes-core/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch
new file mode 100644
index 0000000..fd00b14
--- /dev/null
+++ b/meta-stx/recipes-core/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch
@@ -0,0 +1,36 @@
+From 6722f2ec0b7044cbdeb2e67cfd317375fa54c46d Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Wed, 15 Apr 2020 10:52:15 +0800
+Subject: [PATCH] persist-config: add retry for etcd
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ .../roles/bootstrap/persist-config/tasks/shutdown_services.yml   | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
+index 4edd295..0e5fb3b 100644
+--- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
++++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml
+@@ -60,11 +60,16 @@
+         state: restarted
+ 
+     rescue:
+-      - name: Etcd failed to restart, try one more time
++      - name: Etcd failed to restart, wait 10s then retry
++        wait_for: timeout=10
++      - name: Retry to restart etcd
+         systemd:
+           name: etcd
+           state: restarted
+-
++        register: result
++        until: result is not failed
++        retries: 5
++        delay: 10
+ 
+ - block:  # Revert configuration to loopback interface
+   - name: Set facts derived from previous network configurations
+-- 
+2.7.4
+