Refactor openshift_version setting

Currently, we do lots of manipulation of user-provided
version-related variables.  Often times this manipulation
is undesired and incorrect.

This commit refactors openshift_version to not manipulate
so many things.  We will trust that the user has put
correct variables in their inventory to get the desired
outcome.

Implements: https://trello.com/c/sL9bMo3g/644-refactor-version-handling-to-new-format

playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml

@@ -21,7 +21,7 @@
   block:
   - name: Check latest available OpenShift RPM version
     repoquery:
-      name: "{{ openshift_service_type }}{{ '-' ~ openshift_release ~ '*' if openshift_release is defined else '' }}"
+      name: "{{ openshift_service_type }}{{ '-' ~ openshift_version ~ '*' }}"
       ignore_excluders: true
     register: repoquery_out
 

playbooks/common/openshift-cluster/upgrades/pre/version_override.yml

@@ -18,7 +18,6 @@
         # will be modified by openshift_version; we want to ensure these
         # are initially set to first versions to ensure no accidental usage of
         # second versions (eg, 3.8 and 3.9 respectively) are used.
-        l_double_upgrade_cp_reset_version: True
         openshift_version: "{{ l_double_upgrade_first_version }}"
         openshift_release: "{{ l_double_upgrade_first_release }}"
         openshift_upgrade_target: '3.8'

playbooks/container-runtime/config.yml

@@ -1,8 +1,4 @@
 ---
 - import_playbook: ../init/main.yml
-  vars:
-    skip_version: True
-    l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
 
 - import_playbook: private/config.yml

playbooks/container-runtime/setup_storage.yml

@@ -1,8 +1,4 @@
 ---
 - import_playbook: ../init/main.yml
-  vars:
-    skip_version: True
-    l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
 
 - import_playbook: private/setup_storage.yml

playbooks/init/main.yml

@@ -1,5 +1,5 @@
 ---
-# skip_version and l_install_base_packages are passed in via prerequistes.yml.
+# l_install_base_packages is passed in via prerequistes.yml.
 # skip_sanity_checks is passed in via openshift-node/private/image_prep.yml
 
 - name: Initialization Checkpoint Start
@@ -27,7 +27,6 @@
 - import_playbook: cluster_facts.yml
 
 - import_playbook: version.yml
-  when: not (skip_version | default(False))
 
 - import_playbook: sanity_checks.yml
   when: not (skip_sanity_checks | default(False))

playbooks/init/version.yml

@@ -6,8 +6,6 @@
       name: openshift_version
       tasks_from: first_master.yml
 
-  - debug: msg="openshift_pkg_version set to {{ openshift_pkg_version | default('') }}"
-
   # set_version_facts is a custom module in lib_utils
   # this will set_fact booleans for openshift_verison
   - name: set openshift_version booleans (first master)
@@ -30,14 +28,6 @@
       openshift_pkg_version: "{{ l_first_master_openshift_pkg_version }}"
       openshift_image_tag: "{{ l_first_master_openshift_image_tag }}"
 
-# NOTE: These steps should only be run against masters and nodes.
-- name: Ensure the requested version packages are available.
-  hosts: "{{ l_openshift_version_check_hosts | default('oo_nodes_to_config:oo_masters_to_config:!oo_first_master') }}"
-  tasks:
-  - include_role:
-      name: openshift_version
-      tasks_from: masters_and_nodes.yml
-
   # set_version_facts is a custom module in lib_utils
   # this will set_fact booleans for openshift_verison
   - name: set openshift_version booleans (masters and nodes)

playbooks/openshift-etcd/certificates.yml

@@ -1,7 +1,6 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

playbooks/openshift-etcd/config.yml

@@ -1,7 +1,6 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

playbooks/openshift-etcd/redeploy-ca.yml

@@ -1,7 +1,6 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

playbooks/openshift-etcd/redeploy-certificates.yml

@@ -1,7 +1,6 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

playbooks/openshift-etcd/restart.yml

@@ -1,7 +1,6 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"

playbooks/openshift-etcd/scaleup.yml

@@ -43,7 +43,6 @@
 # prerequisites, we can just init facts as normal.
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config:oo_new_etcd_to_config"
     l_sanity_check_hosts: "{{ groups['oo_new_etcd_to_config'] | union(groups['oo_masters_to_config']) | union(groups['oo_etcd_to_config']) }}"
     l_openshift_version_set_hosts: "all:!all"

playbooks/openshift-etcd/upgrade.yml

@@ -1,7 +1,6 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    skip_version: True
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

playbooks/openshift-node/private/image_prep.yml

@@ -2,13 +2,8 @@
 - name: normalize groups
   import_playbook: ../../prerequisites.yml
   vars:
-    skip_version: True
     skip_sanity_checks: True
     skip_validate_hostnames: True
-
-- name: determine version
-  import_playbook: ../../init/version.yml
-  vars:
     l_openshift_version_determine_hosts: "oo_nodes_to_config"
     l_openshift_version_set_hosts: "all:!all"
     l_openshift_version_check_hosts: "all:!all"

playbooks/prerequisites.yml

@@ -3,10 +3,7 @@
 
 - import_playbook: init/main.yml
   vars:
-    skip_version: True
     l_install_base_packages: True
-    l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
 
 - import_playbook: init/validate_hostnames.yml
   when: not (skip_validate_hostnames | default(False))

roles/container_runtime/defaults/main.yml

@@ -84,8 +84,7 @@ openshift_use_crio: False
 openshift_crio_use_rpm: False
 openshift_use_crio_only: False
 
-l_openshift_image_tag_default: "{{ openshift_release | default('latest') }}"
-l_openshift_image_tag: "{{ openshift_image_tag | default(l_openshift_image_tag_default) | string}}"
+l_openshift_image_tag: "{{ openshift_image_tag | string }}"
 
 l_required_docker_version: '1.12'
 

roles/lib_utils/action_plugins/sanity_checks.py

@@ -24,10 +24,10 @@ v3.5.1.3.4, v1.2-1, v1.2.3-4, v1.2.3-4.5, v1.2.3-4.5.6
 You specified openshift_image_tag={}"""
 
 ORIGIN_TAG_REGEX_ERROR = """openshift_image_tag must be in the format
-v#.#.#[-optional.#]. Examples: v1.2.3, v3.5.1-alpha.1
+v#.#[.#-optional.#]. Examples: v1.2.3, v3.5.1-alpha.1
 You specified openshift_image_tag={}"""
 
-ORIGIN_TAG_REGEX = {'re': '(^v?\\d+\\.\\d+\\.\\d+(-[\\w\\-\\.]*)?$)',
+ORIGIN_TAG_REGEX = {'re': '(^v?\\d+\\.\\d+.*)',
                     'error_msg': ORIGIN_TAG_REGEX_ERROR}
 ENTERPRISE_TAG_REGEX = {'re': '(^v\\d+\\.\\d+(\\.\\d+)*(-\\d+(\\.\\d+)*)?$)',
                         'error_msg': ENTERPRISE_TAG_REGEX_ERROR}

roles/openshift_repos/tasks/centos_repos.yml

@@ -10,16 +10,15 @@
     dest: "/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS"
   notify: refresh cache
 
-# openshift_release is formatted to a standard string in openshift_version role.
-# openshift_release is expected to be in format 'x.y.z...' here.
+# openshift_version is formatted to a standard string in openshift_version role.
+# openshift_version is expected to be in format 'x.y.z...' here.
 # Here, we drop the '.' characters and try to match the correct repo template
-# for our corresponding openshift_release.
+# for our corresponding openshift_version.
 - name: Configure correct origin release repository
   template:
     src: "{{ item }}"
     dest: "/etc/yum.repos.d/{{ (item | basename | splitext)[0] }}"
   with_first_found:
-    - "CentOS-OpenShift-Origin{{ (openshift_release | default('')).split('.') | join('') }}.repo.j2"
-    - "CentOS-OpenShift-Origin{{ ((openshift_release | default('')).split('.') | join(''))[0:2] }}.repo.j2"
+    - "CentOS-OpenShift-Origin{{ ((openshift_version | default('')).split('.') | join(''))[0:2] }}.repo.j2"
     - "CentOS-OpenShift-Origin.repo.j2"
   notify: refresh cache

roles/openshift_repos/tasks/rhel_repos.yml

@@ -26,7 +26,7 @@
   command: subscription-manager repos \
                --enable="rhel-7-server-rpms" \
                --enable="rhel-7-server-extras-rpms" \
-               --enable="rhel-7-server-ose-{{ (openshift_release | default('')).split('.')[0:2] | join('.') }}-rpms" \
+               --enable="rhel-7-server-ose-{{ ( openshift_version ).split('.')[0:2] | join('.') }}-rpms" \
                --enable="rhel-7-fast-datapath-rpms"
   register: subscribe_repos
   until: subscribe_repos | succeeded

roles/openshift_version/defaults/main.yml

@@ -1,15 +1,2 @@
 ---
 openshift_protect_installed_version: True
-
-openshift_service_type_dict:
-  origin: origin
-  openshift-enterprise: atomic-openshift
-
-openshift_service_type: "{{ openshift_service_type_dict[openshift_deployment_type] }}"
-
-openshift_use_crio_only: False
-
-l_first_master_version_task_file: "{{ openshift_is_containerized | ternary('first_master_containerized_version.yml', 'first_master_rpm_version.yml') }}"
-
-# Used during double control plane upgrades.
-l_double_upgrade_cp_reset_version: False

roles/openshift_version/tasks/check_available_rpms.yml

@@ -1,10 +0,0 @@
----
-- name: Get available {{ openshift_service_type }} version
-  repoquery:
-    name: "{{ openshift_service_type }}{{ '-' ~ openshift_release ~ '*' if openshift_release is defined else '' }}"
-    ignore_excluders: true
-  register: rpm_results
-
-- fail:
-    msg: "Package '{{ rpm_results.results.package_name }}' not found"
-  when: not rpm_results.results.package_found

roles/openshift_version/tasks/first_master.yml

@@ -11,17 +11,20 @@
   - openshift_version is not defined or openshift_version == ""
   - openshift_protect_installed_version | bool
 
-- include_tasks: "{{ l_first_master_version_task_file }}"
+- name: Set openshift_version to openshift_release if undefined
+  set_fact:
+    openshift_version: "{{ openshift_release | default('3.10') }}"
+  when:
+  - openshift_version is not defined or openshift_version == ""
 
-# When double upgrade is in process, we want to set everything to match
-# openshift_verison.
 - block:
   - debug:
       msg: "openshift_pkg_version was not defined. Falling back to -{{ openshift_version }}"
   - set_fact:
-      openshift_pkg_version: "-{{ openshift_version }}"
+      # We append an '*' here because yum is not flexible.
+      openshift_pkg_version: "-{{ openshift_version }}*"
   when:
-  - openshift_pkg_version is not defined or l_double_upgrade_cp_reset_version
+  - openshift_pkg_version is not defined
 
 # When double upgrade is in process, we want to set everything to match
 # openshift_verison.
@@ -30,7 +33,7 @@
       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 or l_double_upgrade_cp_reset_version
+  when: openshift_image_tag is not defined
 
 # The end result of these three variables is quite important so make sure they are displayed and logged:
 - debug: var=openshift_release

roles/openshift_version/tasks/first_master_containerized_version.yml

@@ -1,57 +0,0 @@
----
-- name: Set containerized version to configure if openshift_image_tag specified
-  set_fact:
-    # Expects a leading "v" in inventory, strip it off here unless
-    # openshift_image_tag=latest
-    openshift_version: "{{ openshift_image_tag[1:].split('-')[0] if openshift_image_tag != 'latest' else openshift_image_tag }}"
-  when:
-  - openshift_image_tag is defined
-  - openshift_version is not defined
-
-- name: Set containerized version to configure if openshift_release specified
-  set_fact:
-    openshift_version: "{{ openshift_release }}"
-  when:
-  - openshift_release is defined
-  - openshift_version is not defined
-
-- name: Lookup latest containerized version if no version specified
-  command: >
-    docker run --rm {{ openshift_cli_image }}:latest version
-  register: cli_image_version
-  when:
-  - openshift_version is not defined
-  - not openshift_use_crio_only
-
-# 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][1:] }}"
-  when: openshift_version is not defined
-
-# If we got an openshift_version like "3.2", lookup the latest 3.2 container version
-# and use that value instead.
-- name: Set precise containerized version to configure if openshift_release specified
-  command: >
-    docker run --rm {{ openshift_cli_image }}:v{{ openshift_version }} version
-  register: cli_image_version
-  when:
-  - openshift_version is defined
-  - openshift_version.split('.') | length == 2
-  - not openshift_use_crio_only
-
-- set_fact:
-    openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
-  when:
-  - openshift_version is defined
-  - openshift_version.split('.') | length == 2
-  - not openshift_use_crio_only
-
-# TODO: figure out a way to check for the openshift_version when using CRI-O.
-# We should do that using the images in the ostree storage so we don't have
-# to pull them again.
-
-# We finally have the specific version. Now we clean up any strange
-# dangly +c0mm1t-offset tags in the version. See also,
-# openshift_facts.py
-- set_fact:
-    openshift_version: "{{ openshift_version | lib_utils_oo_chomp_commit_offset }}"

roles/openshift_version/tasks/first_master_rpm_version.yml

@@ -1,18 +0,0 @@
----
-- 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,
-    openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}"
-  when:
-  - openshift_pkg_version is defined
-  - openshift_version is not defined
-
-# These tasks should only be run against masters and nodes
-- name: Set openshift_version for rpm installation
-  include_tasks: check_available_rpms.yml
-
-# If double upgrade is in process, we want to set openshift_version to whatever
-# rpm package is available.
-- set_fact:
-    openshift_version: "{{ rpm_results.results.versions.available_versions.0 }}"
-  when: openshift_version is not defined or l_double_upgrade_cp_reset_version

roles/openshift_version/tasks/masters_and_nodes.yml

@@ -1,39 +0,0 @@
----
-# These tasks should only be run against masters and nodes
-
-- block:
-  - name: Check openshift_version for rpm installation
-    include_tasks: check_available_rpms.yml
-  - name: Fail if rpm version and docker image version are different
-    fail:
-      msg: "OCP rpm version {{ rpm_results.results.versions.available_versions.0 }} is different from OCP image version {{ openshift_version }}"
-    # Both versions have the same string representation
-    when: rpm_results.results.versions.available_versions.0 != openshift_version
-  # block when
-  when: not openshift_is_atomic | bool
-
-# We can't map an openshift_release to full rpm version like we can with containers; make sure
-# the rpm version we looked up matches the release requested and error out if not.
-- name: For an RPM install, abort when the release requested does not match the available version.
-  when:
-  - not openshift_is_containerized | bool
-  - openshift_release is defined
-  assert:
-    that:
-    - l_rpm_version.startswith(openshift_release) | bool
-    msg: |-
-      You requested openshift_release {{ openshift_release }}, which is not matched by
-      the latest OpenShift RPM we detected as {{ openshift_service_type }}-{{ l_rpm_version }}
-      on host {{ inventory_hostname }}.
-      We will only install the latest RPMs, so please ensure you are getting the release
-      you expect. You may need to adjust your Ansible inventory, modify the repositories
-      available on the host, or run the appropriate OpenShift upgrade playbook.
-  vars:
-    l_rpm_version: "{{ rpm_results.results.versions.available_versions.0 }}"
-
-# The end result of these three 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