openshift_version: merge into init/version.yml.

playbooks/init/version.yml

@@ -1,7 +1,48 @@
 ---
-- name: Determine openshift_version to configure on first master
+- name: Determine openshift_version to configure
   hosts: oo_nodes_to_config
   tasks:
-  - include_role:
-      name: openshift_version
-      tasks_from: first_master.yml
+  - name: Set openshift_version to openshift_release if undefined
+    set_fact:
+      openshift_version: "4.0"
+    when:
+    - openshift_version is not defined or openshift_version == ""
+
+  - block:
+    - debug:
+        msg: "openshift_pkg_version was not defined. Falling back to -{{ openshift_version }}"
+    - set_fact:
+        # We append an '*' here because yum is not flexible.
+        openshift_pkg_version: "-{{ openshift_version }}*"
+    when:
+    - openshift_pkg_version is not defined
+
+  - block:
+    - debug:
+        msg: "openshift_image_tag was not defined. Falling back to v{{ openshift_version }}"
+    - set_fact:
+        openshift_image_tag: "v{{ openshift_version }}"
+    when: openshift_image_tag is not defined
+
+  - name: assert openshift_release in openshift_image_tag
+    assert:
+      that: openshift_release in openshift_image_tag
+      msg: >
+        openshift_image_tag must match same major version as openshift_release.
+        You provided: {{ openshift_release }} and {{ openshift_image_tag }}
+
+  - name: assert openshift_release in openshift_pkg_version
+    assert:
+      that: openshift_release in openshift_pkg_version
+      msg: >
+        openshift_pkg_version must match same major version as openshift_release.
+        You provided: {{ openshift_release }} and {{ openshift_pkg_version }}
+
+  # The end result of these variables is quite important so make sure they are displayed and logged:
+  - debug: var=openshift_release
+
+  - debug: var=openshift_image_tag
+
+  - debug: var=openshift_pkg_version
+
+  - debug: var=openshift_version

roles/openshift_version/defaults/main.yml

@@ -1,3 +0,0 @@
----
-openshift_protect_installed_version: True
-openshift_release: '4.0'

roles/openshift_version/meta/main.yml

@@ -1,16 +0,0 @@
----
-galaxy_info:
-  author: Devan Goodwin
-  description: Determines the version of OpenShift to install or upgrade to
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 1.9
-  platforms:
-  - name: EL
-    versions:
-    - 7
-  categories:
-  - cloud
-dependencies:
-- role: lib_utils
-- role: openshift_facts

roles/openshift_version/tasks/first_master.yml

@@ -1,47 +0,0 @@
----
-# Determine the openshift_version
-
-- name: Set openshift_version to openshift_release if undefined
-  set_fact:
-    openshift_version: "{{ openshift_release }}"
-  when:
-  - openshift_version is not defined or openshift_version == ""
-
-- block:
-  - debug:
-      msg: "openshift_pkg_version was not defined. Falling back to -{{ openshift_version }}"
-  - set_fact:
-      # We append an '*' here because yum is not flexible.
-      openshift_pkg_version: "-{{ openshift_version }}*"
-  when:
-  - openshift_pkg_version is not defined
-
-- block:
-  - debug:
-      msg: "openshift_image_tag was not defined. Falling back to v{{ openshift_version }}"
-  - set_fact:
-      openshift_image_tag: "v{{ openshift_version }}"
-  when: openshift_image_tag is not defined
-
-- name: assert openshift_release in openshift_image_tag
-  assert:
-    that: openshift_release in openshift_image_tag
-    msg: >
-      openshift_image_tag must match same major version as openshift_release.
-      You provided: {{ openshift_release }} and {{ openshift_image_tag }}
-
-- name: assert openshift_release in openshift_pkg_version
-  assert:
-    that: openshift_release in openshift_pkg_version
-    msg: >
-      openshift_pkg_version must match same major version as openshift_release.
-      You provided: {{ openshift_release }} and {{ openshift_pkg_version }}
-
-# The end result of these variables is quite important so make sure they are displayed and logged:
-- debug: var=openshift_release
-
-- debug: var=openshift_image_tag
-
-- debug: var=openshift_pkg_version
-
-- debug: var=openshift_version

roles/openshift_version/tasks/main.yml

@@ -1,2 +0,0 @@
----
-# This role is meant to be used with include_role.