summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2018-01-17 19:07:28 -0500
committerGitHub <noreply@github.com>2018-01-17 19:07:28 -0500
commitb05b51923132e75f82230e7135bfa9512ed94ee1 (patch)
tree5116fa5375a54997cf745eee872f384bd224e5ac
parent7e83e65fc7a76df0530a56e3f6e3897cb95c316d (diff)
parent2c85de5af492d6be8b46047d4a21fa6d450315ae (diff)
downloadopenshift-b05b51923132e75f82230e7135bfa9512ed94ee1.tar.gz
openshift-b05b51923132e75f82230e7135bfa9512ed94ee1.tar.bz2
openshift-b05b51923132e75f82230e7135bfa9512ed94ee1.tar.xz
openshift-b05b51923132e75f82230e7135bfa9512ed94ee1.zip
Merge pull request #6744 from sosiouxme/20180115-fix-checks
openshift_checks: repair adhoc list-checks mode
-rw-r--r--playbooks/openshift-checks/adhoc.yml1
-rw-r--r--roles/openshift_health_checker/openshift_checks/docker_image_availability.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/openshift-checks/adhoc.yml b/playbooks/openshift-checks/adhoc.yml
index 414090733..249222ae4 100644
--- a/playbooks/openshift-checks/adhoc.yml
+++ b/playbooks/openshift-checks/adhoc.yml
@@ -11,6 +11,7 @@
# usage. Running this play only in localhost speeds up execution.
hosts: localhost
connection: local
+ gather_facts: false
roles:
- openshift_health_checker
vars:
diff --git a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
index 7afb8f730..ac6ffbbad 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
@@ -56,7 +56,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
# ordered list of registries (according to inventory vars) that docker will try for unscoped images
regs = self.ensure_list("openshift_docker_additional_registries")
# currently one of these registries is added whether the user wants it or not.
- deployment_type = self.get_var("openshift_deployment_type")
+ deployment_type = self.get_var("openshift_deployment_type", default="")
if deployment_type == "origin" and "docker.io" not in regs:
regs.append("docker.io")
elif deployment_type == 'openshift-enterprise' and "registry.access.redhat.com" not in regs: