diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-06 15:53:55 -0600 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-06 15:56:54 -0600 |
| commit | 6575595891f71e7d9b9ac929b9ba58117a65e17b (patch) | |
| tree | ab67b815c16d300296d6c751a25daeb1a824d8c6 /roles/openshift_logging_curator/tasks/determine_version.yaml | |
| parent | 9e5462826beb7bece09e55b20f3fe47a65c8b44c (diff) | |
| download | openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.gz openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.bz2 openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.xz openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.zip | |
Updating logging components image defaulting pattern to match openshift_logging pattern
Diffstat (limited to 'roles/openshift_logging_curator/tasks/determine_version.yaml')
| -rw-r--r-- | roles/openshift_logging_curator/tasks/determine_version.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_logging_curator/tasks/determine_version.yaml b/roles/openshift_logging_curator/tasks/determine_version.yaml index 94f8b4a97..2013f4e38 100644 --- a/roles/openshift_logging_curator/tasks/determine_version.yaml +++ b/roles/openshift_logging_curator/tasks/determine_version.yaml @@ -1,16 +1,16 @@ --- # debating making this a module instead? - fail: - msg: Missing version to install provided by 'openshift_logging_image_version' - when: not openshift_logging_image_version or openshift_logging_image_version == '' + msg: Missing version to install provided by 'openshift_logging_curator_image_version' + when: not openshift_logging_curator_image_version or openshift_logging_curator_image_version == '' - set_fact: curator_version: "{{ __latest_curator_version }}" - when: openshift_logging_image_version == 'latest' + when: openshift_logging_curator_image_version == 'latest' # should we just assume that we will have the correct major version? -- set_fact: curator_version="{{ openshift_logging_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}" - when: openshift_logging_image_version != 'latest' +- set_fact: curator_version="{{ openshift_logging_curator_image_version | regex_replace('^v?(?P<major>\d)\.(?P<minor>\d).*$', '3_\\g<minor>') }}" + when: openshift_logging_curator_image_version != 'latest' - fail: msg: Invalid version specified for Curator |