Skip to content

Commit 671ee0e

Browse files
authored
Merge branch 'v3' into PMM-11261-update-via-watchtower
2 parents 1967263 + 848155a commit 671ee0e

File tree

1 file changed

+50
-45
lines changed
  • build/ansible/roles/initialization/tasks

1 file changed

+50
-45
lines changed

build/ansible/roles/initialization/tasks/main.yml

+50-45
Original file line numberDiff line numberDiff line change
@@ -27,56 +27,61 @@
2727

2828
- name: Set need_upgrade fact
2929
set_fact:
30-
need_upgrade: not pmm_current_version is version(pmm_image_version, '>=')
30+
need_upgrade: "{{ pmm_current_version is version(pmm_image_version, '<') }}"
3131

3232
- name: Print current PMM and image versions
3333
debug:
3434
msg: "Current version: {{ pmm_current_version }} Image Version: {{ pmm_image_version }}"
3535

36-
- name: Enable maintenance mode before upgrade
37-
copy:
38-
src: maintenance.html
39-
dest: /usr/share/pmm-server/maintenance/
40-
owner: pmm
41-
group: pmm
42-
mode: 0644
43-
44-
- name: Upgrade dashboards
45-
include_role:
46-
name: dashboards
47-
when: need_upgrade
48-
49-
- name: Copy file with image version
50-
copy:
51-
src: /usr/share/percona-dashboards/VERSION
52-
dest: /srv/grafana/PERCONA_DASHBOARDS_VERSION
53-
owner: pmm
54-
group: pmm
55-
mode: 0644
56-
remote_src: yes
57-
when: need_upgrade
58-
59-
- name: Create a backup directory
60-
file:
61-
path: /srv/backup
62-
state: directory
63-
owner: pmm
64-
group: pmm
65-
mode: 0775
36+
- name: Print need_upgrade fact
37+
debug:
38+
msg: "Need upgrade: {{ need_upgrade }}"
6639

67-
# Note: we want to leave this for some time until we achieve stable builds
68-
- name: Output pmm-managed logs
69-
shell: sleep 10 && tail -n 300 /srv/logs/pmm-managed.log
40+
- name: Perform upgrade tasks
41+
block:
42+
- name: Enable maintenance mode before upgrade
43+
copy:
44+
src: maintenance.html
45+
dest: /usr/share/pmm-server/maintenance/
46+
owner: pmm
47+
group: pmm
48+
mode: 0644
49+
50+
- name: Upgrade dashboards
51+
include_role:
52+
name: dashboards
53+
54+
- name: Copy file with image version
55+
copy:
56+
src: /usr/share/percona-dashboards/VERSION
57+
dest: /srv/grafana/PERCONA_DASHBOARDS_VERSION
58+
owner: pmm
59+
group: pmm
60+
mode: 0644
61+
remote_src: yes
62+
63+
- name: Create a backup directory
64+
file:
65+
path: /srv/backup
66+
state: directory
67+
owner: pmm
68+
group: pmm
69+
mode: 0775
7070

71-
- name: Wait for PMM to be ready
72-
ansible.builtin.uri:
73-
url: "http://127.0.0.1:7772/v1/readyz"
74-
status_code: 200
75-
method: GET
76-
retries: 20
77-
delay: 5
71+
# Note: we want to leave this for some time until we achieve stable builds
72+
- name: Output pmm-managed logs
73+
shell: sleep 10 && tail -n 300 /srv/logs/pmm-managed.log
7874

79-
- name: Disable maintenance mode
80-
file:
81-
state: absent
82-
path: /usr/share/pmm-server/maintenance/maintenance.html
75+
- name: Wait for PMM to be ready
76+
ansible.builtin.uri:
77+
url: "http://127.0.0.1:7772/v1/readyz"
78+
status_code: 200
79+
method: GET
80+
retries: 20
81+
delay: 5
82+
83+
- name: Disable maintenance mode
84+
file:
85+
state: absent
86+
path: /usr/share/pmm-server/maintenance/maintenance.html
87+
when: need_upgrade

0 commit comments

Comments
 (0)