Complete installation of first master containerized.

playbooks/common/openshift-master/config.yml

@@ -360,7 +360,7 @@
     with_items: openshift_master_named_certificates
     when: named_certs_specified | bool
 
-- name: Configure first master instances
+- name: Configure first master instance
   hosts: oo_first_master
   any_errors_fatal: true
   serial: 1
@@ -400,6 +400,7 @@
   - name: Create group for deployment type
     group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
     changed_when: False
+  - fail:
 
 # TODO: This is a copy paste of the oo_first_master, how do we reconcile the code but change openshift_version?
 - name: Configure remaining master instances

roles/openshift_master/tasks/main.yml

@@ -2,7 +2,6 @@
 # TODO: add ability to configure certificates given either a local file to
 #       point to or certificate contents, set in default cert locations.
 - debug: var=openshift_version
-- fail:
 
 # Authentication Variable Validation
 # TODO: validate the different identity provider kinds as well
@@ -31,7 +30,7 @@
 
 - name: Pull master image
   command: >
-    docker pull {{ openshift.master.master_image }}:{{ openshift_version }}
+    docker pull {{ openshift.master.master_image }}:v{{ openshift_version }}
   when: openshift.common.is_containerized | bool
 
 - name: Create openshift.common.data_dir

roles/openshift_master/templates/atomic-openshift-master.j2

@@ -1,7 +1,7 @@
 OPTIONS=--loglevel={{ openshift.master.debug_level }}
 CONFIG_FILE={{ openshift_master_config_file }}
 {% if openshift.common.is_containerized | bool %}
-IMAGE_VERSION={{ openshift_version }}
+IMAGE_VERSION=v{{ openshift_version }}
 {% endif %}
 
 {% if 'cloudprovider' in openshift and 'aws' in openshift.cloudprovider and 'kind' in openshift.cloudprovider and openshift.cloudprovider.kind == 'aws' and 'access_key' in openshift.cloudprovider.aws and 'secret_key' in openshift.cloudprovider.aws %}