diff options
author | Luke Meyer <lmeyer@redhat.com> | 2017-03-22 15:23:29 -0400 |
---|---|---|
committer | Luke Meyer <lmeyer@redhat.com> | 2017-03-29 11:59:47 -0400 |
commit | f5827111a7609b3c6f7f72a03c8bc13fee2bbb60 (patch) | |
tree | 8b1cacfc6290c3a9d33c5a23c56e2715a4d2c399 /playbooks/byo/openshift-master | |
parent | d77a9a685c3add9ef9c4d659ee47ebf35e145fe4 (diff) | |
download | openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.gz openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.bz2 openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.xz openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.zip |
validate and normalize inventory variables
In openshift_repos and everywhere, ensure deployment_type and
openshift_deployment_type are defined and the same.
We really want to set openshift_deployment_type, but users will likely
still have just deployment_type, so accept both. And don't make every
playbook default openshift_deployment_type to deployment_type.
This introduces the openshift_sanitize_inventory role to run before anything else.
Diffstat (limited to 'playbooks/byo/openshift-master')
-rw-r--r-- | playbooks/byo/openshift-master/restart.yml | 2 | ||||
-rw-r--r-- | playbooks/byo/openshift-master/scaleup.yml | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml index 2d20f69f4..21e4cff1b 100644 --- a/playbooks/byo/openshift-master/restart.yml +++ b/playbooks/byo/openshift-master/restart.yml @@ -4,5 +4,3 @@ - always - include: ../../common/openshift-master/restart.yml - vars: - openshift_deployment_type: "{{ deployment_type }}" diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml index 7075bb59e..a5705e990 100644 --- a/playbooks/byo/openshift-master/scaleup.yml +++ b/playbooks/byo/openshift-master/scaleup.yml @@ -27,4 +27,3 @@ vars: openshift_cluster_id: "{{ cluster_id | default('default') }}" openshift_debug_level: "{{ debug_level | default(2) }}" - openshift_deployment_type: "{{ deployment_type }}" |