Revert "Revert "oran-shell-release: release image for F""
[pti/rtp.git] / meta-starlingx / meta-stx-flock / stx-ansible-playbooks / files / 0004-bringup_flock_services-use-systmd-for-fminit-and-add.patch
1 From e83427fbd1cca8f03adb9769c8c2ac260c5f6996 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Wed, 15 Apr 2020 09:49:34 +0800
4 Subject: [PATCH] bringup_flock_services: use systmd for fminit and add retry
5
6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
7 ---
8  .../tasks/bringup_flock_services.yml               | 30 ++++++++++++++++++----
9  1 file changed, 25 insertions(+), 5 deletions(-)
10
11 diff --git a/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml
12 index 462e1c2..cc239ef 100644
13 --- a/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml
14 +++ b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml
15 @@ -36,11 +36,31 @@
16        regexp: "bind_host=.*$"
17        replace: "bind_host={{ controller_floating_address }}"
18  
19 -  - name: Restart FM API and bring up FM Manager
20 -    command: "{{ item }}"
21 -    with_items:
22 -      - /etc/init.d/fm-api restart
23 -      - /etc/init.d/fminit start
24 +  - name: Restart FM API
25 +    systemd:
26 +      name: fm-api
27 +      state: restarted
28 +
29 +  - name: Wait 10s after Restart FM API
30 +    wait_for: timeout=10
31 +
32 +  - block:
33 +    - name: Bring up FM Manager
34 +      systemd:
35 +        name: fminit
36 +        state: started
37 +
38 +    rescue:
39 +      - name: FM Manager failed to start, wait 10s then retry
40 +        wait_for: timeout=10
41 +      - name: Retry to restart FM Manager
42 +        systemd:
43 +          name: fminit
44 +          state: restarted
45 +        register: result
46 +        until: result is not failed
47 +        retries: 5
48 +        delay: 10
49  
50    - name: Bring up Maintenance Agent
51      command: /usr/lib/ocf/resource.d/platform/mtcAgent start
52 -- 
53 2.7.4
54