Resolves openshift_release openshift_version conversion for AWS plays

playbooks/aws/README.md

@@ -61,8 +61,6 @@ under the appropriate groups.  Most variables can exist in the 'all' group.
 # Minimum mandatory provisioning variables.  See provisioning_vars.yml.example.
 # for more information.
 openshift_deployment_type: # 'origin' or 'openshift-enterprise'
-openshift_release: # example: v3.7
-openshift_pkg_version: # example: -3.7.0
 openshift_aws_clusterid: # example: example
 openshift_aws_ssh_key_name: # example: myuser_key
 openshift_aws_base_ami: # example: ami-12345678

playbooks/aws/openshift-cluster/build_ami.yml

@@ -30,6 +30,9 @@
       openshift_node_image_prep_packages:
       - cloud-init
       - cloud-utils-growpart
+  - import_role:
+      name: openshift_version
+      tasks_from: first_master.yml
 
 # This is the part that installs all of the software and configs for the instance
 # to become a node.

playbooks/aws/provisioning_vars.yml.example

@@ -14,12 +14,8 @@
 # Deployment type must be specified.
 openshift_deployment_type: # 'origin' or 'openshift-enterprise'
 
-# openshift_release must be specified.  Use whatever version of openshift
-# that is supported by openshift-ansible that you wish.
-openshift_release: # v3.7
-
 # This will be dependent on the version provided by the yum repository
-openshift_pkg_version: # -3.7.0
+#openshift_pkg_version: # -3.10.0
 
 # OpenShift api port
 # Fulfills a chicken/egg scenario with how Ansible treats host inventory file