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 /roles/openshift_version/tasks | |
| 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 'roles/openshift_version/tasks')
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index 0f2a660a7..35953b744 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -13,14 +13,6 @@ # Normalize some values that we need in a certain format that might be confusing: - set_fact: - openshift_release: "{{ openshift_release[1:] }}" - when: openshift_release is defined and openshift_release[0] == 'v' - -- set_fact: - openshift_release: "{{ openshift_release | string }}" - when: openshift_release is defined - -- 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' |