summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/tasks/main.yml2
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py3
-rw-r--r--roles/openshift_version/tasks/set_version_rpm.yml1
3 files changed, 0 insertions, 6 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index aba852e63..ac065ea51 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -16,8 +16,6 @@
changed_when: false
when: docker_version is defined and not openshift.common.is_atomic | bool
-# TODO: Should we use docker_version defaulted to 1.10 here?
-
# If a docker_version was requested, sanity check that we can install or upgrade to it, and
# no downgrade is required.
- name: Fail if Docker version requested but downgrade is required
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 135224c16..fdd3e8708 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1142,9 +1142,6 @@ def get_openshift_version(facts):
if os.path.isfile('/usr/bin/openshift'):
_, output, _ = module.run_command(['/usr/bin/openshift', 'version'])
version = parse_openshift_version(output)
- # TODO: it probably makes more sense to read this from sysconfig service env files,
- # these control the running versions when containerized, and would work even if the service
- # is dead for some reason.
elif 'common' in facts and 'is_containerized' in facts['common']:
version = get_containerized_openshift_version(facts)
diff --git a/roles/openshift_version/tasks/set_version_rpm.yml b/roles/openshift_version/tasks/set_version_rpm.yml
index cf0a3b51f..7fa74e24f 100644
--- a/roles/openshift_version/tasks/set_version_rpm.yml
+++ b/roles/openshift_version/tasks/set_version_rpm.yml
@@ -1,5 +1,4 @@
---
-# TODO: support openshift_release here?
- name: Set rpm version to configure if openshift_pkg_version specified
set_fact:
# Expects a leading "-" in inventory, strip it off here, and remove trailing release,