|
|
@@ -9,16 +9,55 @@
|
|
|
# be used by default. Users must indicate what they want.
|
|
|
- fail:
|
|
|
msg: "Must specify openshift_release or openshift_image_tag in inventory to install origin. (suggestion: add openshift_release=\"1.2\" to inventory)"
|
|
|
- when: is_containerized | bool and openshift.common.deployment_type == 'origin' and openshift_release is not defined and openshift_image_tag is not defined
|
|
|
+ when:
|
|
|
+ - is_containerized | bool
|
|
|
+ - openshift.common.deployment_type == 'origin'
|
|
|
+ - openshift_release is not defined
|
|
|
+ - openshift_image_tag is not defined
|
|
|
|
|
|
# Normalize some values that we need in a certain format that might be confusing:
|
|
|
- set_fact:
|
|
|
- openshift_image_tag: "{{ 'v' + openshift_image_tag }}"
|
|
|
- when: openshift_image_tag is defined and openshift_image_tag[0] != 'v' and openshift_image_tag != 'latest'
|
|
|
+ openshift_release: "{{ openshift_release[1:] }}"
|
|
|
+ when:
|
|
|
+ - openshift_release is defined
|
|
|
+ - openshift_release[0] == 'v'
|
|
|
|
|
|
- set_fact:
|
|
|
- openshift_pkg_version: "{{ '-' + openshift_pkg_version }}"
|
|
|
- when: openshift_pkg_version is defined and openshift_pkg_version[0] != '-'
|
|
|
+ openshift_release: "{{ openshift_release | string }}"
|
|
|
+ when: openshift_release is defined
|
|
|
+
|
|
|
+# Verify that the image tag is in a valid format
|
|
|
+- block:
|
|
|
+
|
|
|
+ # Verifies that when the deployment type is origin the version:
|
|
|
+ # - starts with a v
|
|
|
+ # - Has 3 integers seperated by dots
|
|
|
+ # It also allows for optional trailing data which:
|
|
|
+ # - must start with a dash
|
|
|
+ # - may contain numbers, letters, dashes and dots.
|
|
|
+ - name: Verify Origin openshift_image_tag is valid
|
|
|
+ assert:
|
|
|
+ that:
|
|
|
+ - "{{ openshift_image_tag|match('(^v?\\d+\\.\\d+\\.\\d+(-[\\w\\-\\.]*)?$)') }}"
|
|
|
+ msg: "openshift_image_tag must be in the format v#.#.#[-optional.#]. Examples: v1.2.3, v3.5.1-alpha.1"
|
|
|
+ when: openshift.common.deployment_type == 'origin'
|
|
|
+
|
|
|
+ # Verifies that when the deployment type is openshift-enterprise the version:
|
|
|
+ # - starts with a v
|
|
|
+ # - Has at least 2 integers seperated by dots
|
|
|
+ # It also allows for optional trailing data which:
|
|
|
+ # - must start with a dash
|
|
|
+ # - may contain numbers
|
|
|
+ - name: Verify Enterprise openshift_image_tag is valid
|
|
|
+ assert:
|
|
|
+ that:
|
|
|
+ - "{{ openshift_image_tag|match('(^v\\d+\\.\\d+[\\.\\d+]*(-\\d+)?$)') }}"
|
|
|
+ msg: "openshift_image_tag must be in the format v#.#[.#[.#]]. Examples: v1.2, v3.4.1, v3.5.1.3, v1.2-1, v1.2.3-4"
|
|
|
+ when: openshift.common.deployment_type == 'openshift-enterprise'
|
|
|
+
|
|
|
+ when:
|
|
|
+ - openshift_image_tag is defined
|
|
|
+ - openshift_image_tag != "latest"
|
|
|
|
|
|
# Make sure we copy this to a fact if given a var:
|
|
|
- set_fact:
|
|
|
@@ -30,7 +69,10 @@
|
|
|
- name: Use openshift.common.version fact as version to configure if already installed
|
|
|
set_fact:
|
|
|
openshift_version: "{{ openshift.common.version }}"
|
|
|
- when: openshift.common.version is defined and openshift_version is not defined and openshift_protect_installed_version | bool
|
|
|
+ when:
|
|
|
+ - openshift.common.version is defined
|
|
|
+ - openshift_version is not defined
|
|
|
+ - openshift_protect_installed_version | bool
|
|
|
|
|
|
- name: Set openshift_version for rpm installation
|
|
|
include: set_version_rpm.yml
|
|
|
@@ -40,17 +82,39 @@
|
|
|
include: set_version_containerized.yml
|
|
|
when: is_containerized | bool
|
|
|
|
|
|
+# Warn if the user has provided an openshift_image_tag but is not doing a containerized install
|
|
|
+# NOTE: This will need to be modified/removed for future container + rpm installations work.
|
|
|
+- name: Warn if openshift_image_tag is defined when not doing a containerized install
|
|
|
+ debug:
|
|
|
+ msg: >
|
|
|
+ openshift_image_tag is used for containerized installs. If you are trying to
|
|
|
+ specify an image for a non-container install see oreg_url.
|
|
|
+ when:
|
|
|
+ - not is_containerized | bool
|
|
|
+ - openshift_image_tag is defined
|
|
|
+
|
|
|
+
|
|
|
# At this point we know openshift_version is set appropriately. Now we set
|
|
|
# openshift_image_tag and openshift_pkg_version, so all roles can always assume
|
|
|
# each of this variables *will* be set correctly and can use them per their
|
|
|
# intended purpose.
|
|
|
|
|
|
-- set_fact:
|
|
|
- openshift_image_tag: v{{ openshift_version }}
|
|
|
+- 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
|
|
|
|
|
|
-- set_fact:
|
|
|
- openshift_pkg_version: -{{ openshift_version }}
|
|
|
+- block:
|
|
|
+ - debug:
|
|
|
+ msg: "openshift_pkg_version was not defined. Falling back to -{{ openshift_version }}"
|
|
|
+
|
|
|
+ - set_fact:
|
|
|
+ openshift_pkg_version: -{{ openshift_version }}
|
|
|
+
|
|
|
when: openshift_pkg_version is not defined
|
|
|
|
|
|
- fail:
|
|
|
@@ -67,13 +131,18 @@
|
|
|
|
|
|
- fail:
|
|
|
msg: "No OpenShift version available, please ensure your systems are fully registered and have access to appropriate yum repositories."
|
|
|
- when: not is_containerized | bool and openshift_version == '0.0'
|
|
|
+ when:
|
|
|
+ - not is_containerized | bool
|
|
|
+ - openshift_version == '0.0'
|
|
|
|
|
|
# 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.
|
|
|
- fail:
|
|
|
msg: "Detected OpenShift version {{ openshift_version }} does not match requested openshift_release {{ openshift_release }}. You may need to adjust your yum repositories, inventory, or run the appropriate OpenShift upgrade playbook."
|
|
|
- when: not is_containerized | bool and openshift_release is defined and not openshift_version.startswith(openshift_release) | bool
|
|
|
+ when:
|
|
|
+ - not is_containerized | bool
|
|
|
+ - openshift_release is defined
|
|
|
+ - not openshift_version.startswith(openshift_release) | bool
|
|
|
|
|
|
# The end result of these three variables is quite important so make sure they are displayed and logged:
|
|
|
- debug: var=openshift_release
|
OpenShift Bot