More version fixes.

roles/openshift_cli/templates/openshift.j2

@@ -5,7 +5,7 @@ fi
 cmd=`basename $0`
 user=`id -u`
 group=`id -g`
-image_tag="v{{ openshift_version }}"
+image_tag="{{ openshift_image_tag }}"
 
 >&2 echo """
 ================================================================================

roles/openshift_version/tasks/main.yml

@@ -45,7 +45,6 @@
     openshift_pkg_version: -{{ openshift_version }}
   when: openshift_pkg_version is not defined
 
-# TODO: fail if any of these is unset or looks wrong:
 - debug: var=openshift_version
 - debug: var=openshift_pkg_version
 - debug: var=openshift_image_tag

roles/openshift_version/tasks/set_version_containerized.yml

@@ -18,21 +18,14 @@
 
 - debug: var=cli_image_version
 
-# Origin latest = released version (i.e. 1.2.0)
-- set_fact:
-    openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
-  when: openshift_version is not defined and openshift.common.deployment_type == 'origin' and cli_image_version.stdout_lines[0].split('-') | length == 0
-
-
 # Origin latest = pre-release version (i.e. v1.3.0-alpha.1-321-gb095e3a)
 - set_fact:
     openshift_version: "{{ (cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2] | join('-'))[1:] }}"
   when: openshift_version is not defined and openshift.common.deployment_type == 'origin' and cli_image_version.stdout_lines[0].split('-') | length > 1
 
-# OSE
 - set_fact:
     openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
-  when: openshift_version is not defined and openshift.common.deployment_type != 'origin'
+  when: openshift_version is not defined
 
 - debug: msg="{{ openshift_version }}"