diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2018-01-05 11:06:43 -0600 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2018-02-05 13:44:16 -0600 |
| commit | d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78 (patch) | |
| tree | 1e07b2d1dba87ea685899c167ddc2c85c68344ed /roles/openshift_logging_elasticsearch/tasks/determine_version.yaml | |
| parent | 3e2c7c22a54a3ccf88b49742003a3a4a937683f8 (diff) | |
| download | openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.gz openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.bz2 openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.xz openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.zip | |
Adding support for ES 5.x tech preview opt in
Diffstat (limited to 'roles/openshift_logging_elasticsearch/tasks/determine_version.yaml')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/determine_version.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/determine_version.yaml b/roles/openshift_logging_elasticsearch/tasks/determine_version.yaml index c55e7c5ea..a7cc8f0ec 100644 --- a/roles/openshift_logging_elasticsearch/tasks/determine_version.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/determine_version.yaml @@ -10,10 +10,14 @@ # should we just assume that we will have the correct major version? - set_fact: es_version="{{ openshift_logging_elasticsearch_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}" - when: openshift_logging_elasticsearch_image_version != 'latest' + when: + - openshift_logging_elasticsearch_image_version != 'latest' + - not openshift_logging_es5_techpreview | default(false) | bool - fail: msg: Invalid version specified for Elasticsearch - when: es_version not in __allowed_es_versions + when: + - es_version not in __allowed_es_versions + - not openshift_logging_es5_techpreview | default(false) | bool - include_tasks: get_es_version.yml |