Remove/update TODOs.

4 files changed, 2 insertions, 7 deletions

diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
index 6c27b0d44..0ea315d0a 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
@@ -67,7 +67,8 @@
   - include: ../../../../../roles/openshift_node/handlers/main.yml
   tasks:
   # TODO: To better handle re-trying failed upgrades, it would be nice to check if the node
-  # or docker actually needs an upgrade before proceeding.
+  # or docker actually needs an upgrade before proceeding. Perhaps best to save this until
+  # we merge upgrade functionality into the base roles and a normal config.yml playbook run.
   - name: Mark unschedulable if host is a node
     command: >
       {{ openshift.common.admin_binary }} manage-node {{ openshift.common.hostname | lower }} --schedulable=false
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,