summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-07 18:34:56 -0500
committerGitHub <noreply@github.com>2017-04-07 18:34:56 -0500
commit515e33d4c855a5f0f326e8aafd6d9207945db343 (patch)
tree507a694f91968bbd266f946373276c5917ce1a6f /roles
parent96d791aab42dced63f7dfba34a6ce88047014361 (diff)
parent6401deac34a26b137a566087ba18e422d873f96b (diff)
downloadopenshift-515e33d4c855a5f0f326e8aafd6d9207945db343.tar.gz
openshift-515e33d4c855a5f0f326e8aafd6d9207945db343.tar.bz2
openshift-515e33d4c855a5f0f326e8aafd6d9207945db343.tar.xz
openshift-515e33d4c855a5f0f326e8aafd6d9207945db343.zip
Merge pull request #3859 from sosiouxme/20170405-validate-release
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_sanitize_inventory/tasks/main.yml21
1 files changed, 14 insertions, 7 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index fc562c42c..b944c8991 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/roles/openshift_sanitize_inventory/tasks/main.yml
@@ -1,6 +1,5 @@
---
- name: Standardize on latest variable names
- no_log: True # keep task description legible
set_fact:
# goal is to deprecate deployment_type in favor of openshift_deployment_type.
# both will be accepted for now, but code should refer to the new name.
@@ -8,8 +7,15 @@
deployment_type: "{{ openshift_deployment_type | default(deployment_type) | default | string }}"
openshift_deployment_type: "{{ openshift_deployment_type | default(deployment_type) | default | string }}"
+- name: Abort when deployment type is invalid
+ # this variable is required; complain early and clearly if it is invalid.
+ when: openshift_deployment_type not in known_openshift_deployment_types
+ fail:
+ msg: |-
+ Please set openshift_deployment_type to one of:
+ {{ known_openshift_deployment_types | join(', ') }}
+
- name: Normalize openshift_release
- no_log: True # keep task description legible
set_fact:
# Normalize release if provided, e.g. "v3.5" => "3.5"
# Currently this is not required to be defined for all installs, and the
@@ -19,10 +25,11 @@
openshift_release: "{{ openshift_release | string | regex_replace('^v', '') }}"
when: openshift_release is defined
-- name: Ensure a valid deployment type has been given.
- # this variable is required; complain early and clearly if it is invalid.
- when: openshift_deployment_type not in known_openshift_deployment_types
+- name: Abort when openshift_release is invalid
+ when:
+ - openshift_release is defined
+ - not openshift_release | match('\d+(\.\d+){1,3}$')
fail:
msg: |-
- Please set openshift_deployment_type to one of:
- {{ known_openshift_deployment_types | join(', ') }}
+ openshift_release is "{{ openshift_release }}" which is not a valid version string.
+ Please set it to a version string like "3.4".