Skip to content

Commit 1166895

Browse files
danpawlikholser
authored andcommitted
Create retry_delay var for each place
There is no need to make so often queries if the service is ready. It some roles, delay is 2, in some other 5 and other 6. Let's increase delay from 2 to 5 as default value and parametrize it to overwrite the value if needed. Such overwrite might be helpful for hosts that does not have enough compute resources. Signed-off-by: Daniel Pawlik <[email protected]>
1 parent e9fc89b commit 1166895

File tree

50 files changed

+89
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+89
-63
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
autoscaling_retry_delay: 5

tests/roles/autoscaling_adoption/tasks/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
register: aodh_running_result
2828
until: aodh_running_result is success
2929
retries: 60
30-
delay: 2
30+
delay: "{{ autoscaling_retry_delay }}"
3131

3232
- name: check that Aodh is reachable and its endpoints are defined
3333
ansible.builtin.shell: |
@@ -39,4 +39,4 @@
3939
register: aodh_responding_result
4040
until: aodh_responding_result is success
4141
retries: 60
42-
delay: 2
42+
delay: "{{ autoscaling_retry_delay }}"

tests/roles/backend_services/defaults/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ dpa_tests_dir: "{{ dpa_dir }}/tests"
2626
# director operator namespace
2727
director_namespace: "ospdo_openstack"
2828
# adoption repo default location
29+
backend_retry_delay: 5

tests/roles/backend_services/tasks/main.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
register: mariadb_running_result
121121
until: mariadb_running_result is success
122122
retries: 60
123-
delay: 5
123+
delay: "{{ backend_retry_delay }}"
124124
# TODO- debug value (was 2)
125125

126126
- name: verify that MariaDB and RabbitMQ CR's deployed, for all defined cells
@@ -131,7 +131,7 @@
131131
register: service_cr_result
132132
until: service_cr_result.stdout == "true"
133133
retries: 60
134-
delay: 5
134+
delay: "{{ backend_retry_delay }}"
135135
failed_when: service_cr_result.rc != 0 and service_cr_result.stdout != "true"
136136
loop:
137137
- "Galera"
@@ -170,4 +170,4 @@
170170
register: openstack_control_plane_cr_result
171171
until: openstack_control_plane_cr_result is success
172172
retries: 60
173-
delay: 2
173+
delay: "{{ backend_retry_delay }}"

tests/roles/barbican_adoption/defaults/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ barbican_patch: |
3838
replicas: 1
3939
barbicanKeystoneListener:
4040
replicas: 1
41+
barbican_retry_delay: 5

tests/roles/barbican_adoption/tasks/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
register: barbican_running_result
2020
until: barbican_running_result is success
2121
retries: 180
22-
delay: 2
22+
delay: "{{ barbican_retry_delay }}"
2323

2424
- name: check that Barbican is reachable and its endpoints are defined
2525
ansible.builtin.shell: |
@@ -33,7 +33,7 @@
3333
register: barbican_responding_result
3434
until: barbican_responding_result is success
3535
retries: 60
36-
delay: 2
36+
delay: "{{ barbican_retry_delay }}"
3737

3838
- name: check that Barbican secret payload was migrated successfully
3939
when: prelaunch_barbican_secret|default(false)

tests/roles/ceph_migrate/defaults/main.yml renamed to tests/roles/ceph_migrate/defaults/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,4 @@ ceph_prometheus_container_image: "quay.io/prometheus/prometheus:v2.43.0"
4949
ceph_storagenfs_nic: "nic2"
5050
ceph_storagenfs_vlan_id: "70"
5151
rhoso_namespace: "openstack"
52+
ceph_retry_delay: 5

tests/roles/ceph_migrate/tasks/mon.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
register: monmap
3030
until: (monmap.stdout | from_json | community.general.json_query('monmap.num_mons') | int) >= ((decomm_nodes |default([]) | length | int) | default(3))
3131
retries: 100
32-
delay: 5
32+
delay: "{{ ceph_retry_delay }}"
3333
tags:
3434
- ceph_mon_quorum
3535

@@ -140,7 +140,7 @@
140140
until: '"Removed" in rmmon.stdout'
141141
register: rmmon
142142
retries: 30
143-
delay: 4
143+
delay: "{{ ceph_retry_delay }}"
144144
loop_control:
145145
label: "MON - Get tmp mon"
146146
notify: restart mgr
@@ -169,7 +169,7 @@
169169
register: monmap
170170
until: (monmap.stdout | from_json | community.general.json_query('monmap.num_mons') | int) >= ((decomm_nodes |default([]) | length | int) | default(3))
171171
retries: 100
172-
delay: 5
172+
delay: "{{ ceph_retry_delay }}"
173173
tags:
174174
- ceph_mon_quorum
175175

tests/roles/ceph_migrate/tasks/wait_daemons.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ansible.builtin.command: "{{ ceph_cli }} orch ps --daemon_type {{ daemon }} {{ d_id }} -f json"
1616
register: daemonstat
1717
retries: 200
18-
delay: 5
18+
delay: "{{ ceph_retry_delay }}"
1919
until: "'running' in daemonstat.stdout | from_json | community.general.json_query('[*].status_desc') | default([]) | list"
2020
loop_control:
2121
label: "wait for {{ daemon }}"

tests/roles/cinder_adoption/defaults/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,4 @@ cinder_volume_netapp_vars:
129129

130130
# Vars for cinder-backup
131131
cinder_backup_nfs_backup_mount_point_base: "/var/lib/cinder/backup"
132+
cinder_retry_delay: 5

0 commit comments

Comments
 (0)