summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-30 19:05:12 -0400
committerGitHub <noreply@github.com>2017-06-30 19:05:12 -0400
commitc534ae91e998d28b974260aa090d182f7324c4ac (patch)
treec1451e367f0eeced9ef289ec192e0541ebd0dfcf
parentcfbd8abf4bbcf7dbdab0327420b25d4b7e82a327 (diff)
parent4d3574957508c257e12d9ba8ec8de48ed9789eb9 (diff)
downloadopenshift-c534ae91e998d28b974260aa090d182f7324c4ac.tar.gz
openshift-c534ae91e998d28b974260aa090d182f7324c4ac.tar.bz2
openshift-c534ae91e998d28b974260aa090d182f7324c4ac.tar.xz
openshift-c534ae91e998d28b974260aa090d182f7324c4ac.zip
Merge pull request #4655 from sosiouxme/20170630-atomic-etcd-bz1466622
Merged by openshift-bot
-rw-r--r--roles/openshift_health_checker/openshift_checks/docker_image_availability.py3
-rw-r--r--roles/openshift_health_checker/test/docker_image_availability_test.py14
2 files changed, 16 insertions, 1 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 26bf4c09b..bde81ad2c 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
@@ -94,7 +94,8 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
required = set()
deployment_type = get_var(task_vars, "openshift_deployment_type")
host_groups = get_var(task_vars, "group_names")
- image_tag = get_var(task_vars, "openshift_image_tag")
+ # containerized etcd may not have openshift_image_tag, see bz 1466622
+ image_tag = get_var(task_vars, "openshift_image_tag", default="latest")
image_info = DEPLOYMENT_IMAGE_INFO[deployment_type]
if not image_info:
return required
diff --git a/roles/openshift_health_checker/test/docker_image_availability_test.py b/roles/openshift_health_checker/test/docker_image_availability_test.py
index 0a7c0f8d3..3b9e097fb 100644
--- a/roles/openshift_health_checker/test/docker_image_availability_test.py
+++ b/roles/openshift_health_checker/test/docker_image_availability_test.py
@@ -259,3 +259,17 @@ def test_required_images(deployment_type, is_containerized, groups, oreg_url, ex
)
assert expected == DockerImageAvailability("DUMMY").required_images(task_vars)
+
+
+def test_containerized_etcd():
+ task_vars = dict(
+ openshift=dict(
+ common=dict(
+ is_containerized=True,
+ ),
+ ),
+ openshift_deployment_type="origin",
+ group_names=['etcd'],
+ )
+ expected = set(['registry.access.redhat.com/rhel7/etcd'])
+ assert expected == DockerImageAvailability("DUMMY").required_images(task_vars)