diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-27 10:30:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 10:30:20 -0400 |
| commit | 9fc3615db36806272973cbc480bfcce7b93709f9 (patch) | |
| tree | 7f86b5a803645b3d331032b5dfcae198467bb93a /roles | |
| parent | d645b81d0a60a682b0c488d0f9a08383542d659e (diff) | |
| parent | c66536bc27db98232ba1e231cfdee48a72936d5b (diff) | |
| download | openshift-9fc3615db36806272973cbc480bfcce7b93709f9.tar.gz openshift-9fc3615db36806272973cbc480bfcce7b93709f9.tar.bz2 openshift-9fc3615db36806272973cbc480bfcce7b93709f9.tar.xz openshift-9fc3615db36806272973cbc480bfcce7b93709f9.zip | |
Merge pull request #5742 from mtnbikenc/refactor-checks
1504593 Refactor health check playbooks
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 d8a5c61f9..b17358882 100644 --- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py +++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py @@ -72,6 +72,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', @@ -93,6 +94,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"] |