summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-12 08:08:00 -0500
committerGitHub <noreply@github.com>2017-04-12 08:08:00 -0500
commit8d34cd374e9798e747ea02b0657571e717f25e76 (patch)
treec6f8e98d0951cde22d61ba6099af75bd0452e42c /roles
parent9ba1fde05566fb7ae188e2b06aef89e6bab723eb (diff)
parent3d4fe8880959ccfe0da6be4394926f7570a90bbf (diff)
downloadopenshift-8d34cd374e9798e747ea02b0657571e717f25e76.tar.gz
openshift-8d34cd374e9798e747ea02b0657571e717f25e76.tar.bz2
openshift-8d34cd374e9798e747ea02b0657571e717f25e76.tar.xz
openshift-8d34cd374e9798e747ea02b0657571e717f25e76.zip
Merge pull request #3902 from sosiouxme/20170410-validate-deployment-type
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_sanitize_inventory/tasks/main.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index b944c8991..f15dc16d1 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/roles/openshift_sanitize_inventory/tasks/main.yml
@@ -1,4 +1,17 @@
---
+- name: Abort when conflicting deployment type variables are set
+ when:
+ - deployment_type is defined
+ - openshift_deployment_type is defined
+ - openshift_deployment_type != deployment_type
+ fail:
+ msg: |-
+ openshift_deployment_type is set to "{{ openshift_deployment_type }}".
+ deployment_type is set to "{{ deployment_type }}".
+ To avoid unexpected results, this conflict is not allowed.
+ deployment_type is deprecated in favor of openshift_deployment_type.
+ Please specify only openshift_deployment_type, or make both the same.
+
- name: Standardize on latest variable names
set_fact:
# goal is to deprecate deployment_type in favor of openshift_deployment_type.