Merge pull request #6671 from mgugino-upstream-stage/upgrade-cp-scope

Automatic merge from submit-queue.

Limit host group scope on control-plane upgrades

This commit limits common init code to exclude
oo_nodes_to_config during upgrade_control_plane runs.

1 files changed, 65 insertions, 0 deletions

diff --git a/roles/openshift_version/tasks/first_master_containerized_version.yml b/roles/openshift_version/tasks/first_master_containerized_version.yml
new file mode 100644
index 000000000..e02a75eab
--- /dev/null
+++ b/roles/openshift_version/tasks/first_master_containerized_version.yml
@@ -0,0 +1,65 @@
+---
+- 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:2] | join('-'))[1:] }}"
+  when:
+  - openshift_version is not defined
+  - openshift.common.deployment_type == 'origin'
+  - cli_image_version.stdout_lines[0].split('-') | length > 1
+  - not openshift_use_crio_only
+
+- 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:2][1:] | join('-') if openshift.common.deployment_type == 'origin' else 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 }}"