diff options
author | Luke Meyer <lmeyer@redhat.com> | 2017-10-04 09:00:17 -0400 |
---|---|---|
committer | Luke Meyer <lmeyer@redhat.com> | 2017-10-04 10:53:21 -0400 |
commit | 7edc17b56309d259634331527bf5f343f45baeaf (patch) | |
tree | ddece59d770d248295e792f905c58b54e04303d7 /roles/openshift_health_checker/openshift_checks/docker_image_availability.py | |
parent | a25709a6f16913b59ef2edc3e07d8bc8a598f41e (diff) | |
download | openshift-7edc17b56309d259634331527bf5f343f45baeaf.tar.gz openshift-7edc17b56309d259634331527bf5f343f45baeaf.tar.bz2 openshift-7edc17b56309d259634331527bf5f343f45baeaf.tar.xz openshift-7edc17b56309d259634331527bf5f343f45baeaf.zip |
openshift_checks: use oo group names everywhere
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/docker_image_availability.py')
-rw-r--r-- | roles/openshift_health_checker/openshift_checks/docker_image_availability.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 fa07c1dde..63ccadcd1 100644 --- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py +++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py @@ -114,7 +114,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck): # template for images that run on top of OpenShift image_url = "{}/{}-{}:{}".format(image_info["namespace"], image_info["name"], "${component}", "${version}") image_url = self.get_var("oreg_url", default="") or image_url - if 'nodes' in host_groups: + if 'oo_nodes_to_config' in host_groups: for suffix in NODE_IMAGE_SUFFIXES: required.add(image_url.replace("${component}", suffix).replace("${version}", image_tag)) # The registry-console is for some reason not prefixed with ose- like the other components. @@ -125,13 +125,13 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck): # images for containerized components if self.get_var("openshift", "common", "is_containerized"): components = set() - if 'nodes' in host_groups: + if 'oo_nodes_to_config' in host_groups: components.update(["node", "openvswitch"]) - if 'masters' in host_groups: # name is "origin" or "ose" + if 'oo_masters_to_config' in host_groups: # name is "origin" or "ose" components.add(image_info["name"]) for component in components: required.add("{}/{}:{}".format(image_info["namespace"], component, image_tag)) - if 'etcd' in host_groups: # special case, note it is the same for origin/enterprise + if 'oo_etcd_to_config' in host_groups: # special case, note it is the same for origin/enterprise required.add("registry.access.redhat.com/rhel7/etcd") # and no image tag return required |