diff options
| author | Russell Teague <rteague@redhat.com> | 2017-10-12 14:50:15 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-10-12 14:50:15 -0400 |
| commit | c66536bc27db98232ba1e231cfdee48a72936d5b (patch) | |
| tree | adab4ca4090e3cfcffdb1e97b73241c620f7b7bc /roles | |
| parent | 45725a38dd8ee6db16a89144f1e14c30f98440b8 (diff) | |
| download | openshift-c66536bc27db98232ba1e231cfdee48a72936d5b.tar.gz openshift-c66536bc27db98232ba1e231cfdee48a72936d5b.tar.bz2 openshift-c66536bc27db98232ba1e231cfdee48a72936d5b.tar.xz openshift-c66536bc27db98232ba1e231cfdee48a72936d5b.zip | |
Refactor health check playbooks
- Standardize play/tasks naming
- Move install checks to separate playbook with checkpointing
- Correct 'docker_storage' tags
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/installer_checkpoint/callback_plugins/installer_checkpoint.py | 5 | ||||
| -rw-r--r-- | roles/openshift_health_checker/openshift_checks/docker_storage.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py index ac369b882..07c58f9cd 100644 --- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py +++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py @@ -70,6 +70,7 @@ class CallbackModule(CallbackBase): # Set the order of the installer phases installer_phases = [ 'installer_phase_initialize', + 'installer_phase_health', 'installer_phase_etcd', 'installer_phase_nfs', 'installer_phase_loadbalancer', @@ -90,6 +91,10 @@ class CallbackModule(CallbackBase): 'title': 'Initialization', 'playbook': '' }, + 'installer_phase_health': { + 'title': 'Health Check', + 'playbook': 'playbooks/byo/openshift-checks/pre-install.yml' + }, 'installer_phase_etcd': { 'title': 'etcd Install', 'playbook': 'playbooks/byo/openshift-etcd/config.yml' diff --git a/roles/openshift_health_checker/openshift_checks/docker_storage.py b/roles/openshift_health_checker/openshift_checks/docker_storage.py index 0558ddf14..6808d8b2f 100644 --- a/roles/openshift_health_checker/openshift_checks/docker_storage.py +++ b/roles/openshift_health_checker/openshift_checks/docker_storage.py @@ -14,7 +14,7 @@ class DockerStorage(DockerHostMixin, OpenShiftCheck): """ name = "docker_storage" - tags = ["pre-install", "health", "preflight"] + tags = ["health", "preflight"] dependencies = ["python-docker-py"] storage_drivers = ["devicemapper", "overlay", "overlay2"] |