summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-04 12:51:22 -0500
committerGitHub <noreply@github.com>2017-12-04 12:51:22 -0500
commit2eecb801febfefcc54ce01189e82e2c89027f519 (patch)
tree90aae3bf3252251731deaddb96cb97835d8fddf5
parent1a3800dd20529ab02a502a55908ae2f6a4330dc1 (diff)
parentb72517f9e84921d2b6cb1685d08f3b6f8ea088f3 (diff)
downloadopenshift-2eecb801febfefcc54ce01189e82e2c89027f519.tar.gz
openshift-2eecb801febfefcc54ce01189e82e2c89027f519.tar.bz2
openshift-2eecb801febfefcc54ce01189e82e2c89027f519.tar.xz
openshift-2eecb801febfefcc54ce01189e82e2c89027f519.zip
Merge pull request #6344 from elad661/management-configurable-retries
Allow number of retries in openshift_management to be configurable
-rw-r--r--roles/openshift_management/defaults/main.yml2
-rw-r--r--roles/openshift_management/tasks/main.yml4
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_management/defaults/main.yml b/roles/openshift_management/defaults/main.yml
index 8ba65b386..e768961ce 100644
--- a/roles/openshift_management/defaults/main.yml
+++ b/roles/openshift_management/defaults/main.yml
@@ -3,6 +3,8 @@
openshift_management_project: openshift-management
# Namespace/project description
openshift_management_project_description: CloudForms Management Engine
+# Number of retries when waiting for the app to start (retried every 30 seconds)
+openshift_management_pod_rollout_retries: 30
######################################################################
# BASE TEMPLATE AND DATABASE OPTIONS
diff --git a/roles/openshift_management/tasks/main.yml b/roles/openshift_management/tasks/main.yml
index 9be923a57..3bade9e8c 100644
--- a/roles/openshift_management/tasks/main.yml
+++ b/roles/openshift_management/tasks/main.yml
@@ -88,9 +88,9 @@
create: True
params: "{{ openshift_management_template_parameters }}"
-- name: Wait for the app to come up. May take several minutes, 30s check intervals, 10m max
+- name: Wait for the app to come up. May take several minutes, 30s check intervals, {{ openshift_management_pod_rollout_retries }} retries
command: "oc logs {{ openshift_management_flavor }}-0 -n {{ openshift_management_project }}"
register: app_seeding_logs
until: app_seeding_logs.stdout.find('Server starting complete') != -1
delay: 30
- retries: 20
+ retries: "{{ openshift_management_pod_rollout_retries }}"