diff options
Diffstat (limited to 'roles/openshift_logging_curator')
| -rw-r--r-- | roles/openshift_logging_curator/tasks/main.yaml | 7 | ||||
| -rw-r--r-- | roles/openshift_logging_curator/vars/default_images.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_curator/vars/openshift-enterprise.yml | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml index 6e8605d28..456a25082 100644 --- a/roles/openshift_logging_curator/tasks/main.yaml +++ b/roles/openshift_logging_curator/tasks/main.yaml @@ -14,6 +14,13 @@ - include_tasks: determine_version.yaml +- name: Ensure that logging curator has nodes to run on + fail: + msg: |- + No schedulable nodes found matching node selector for logging curator - '{{ openshift_logging_curator_nodeselector }}' + when: + - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_logging_curator_nodeselector) + # allow passing in a tempdir - name: Create temp directory for doing work in command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX diff --git a/roles/openshift_logging_curator/vars/default_images.yml b/roles/openshift_logging_curator/vars/default_images.yml index 208b41afa..503be9b58 100644 --- a/roles/openshift_logging_curator/vars/default_images.yml +++ b/roles/openshift_logging_curator/vars/default_images.yml @@ -1,3 +1,3 @@ --- __openshift_logging_curator_image_prefix: "{{ openshift_logging_image_prefix | default('docker.io/openshift/origin-') }}" -__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default('latest') }}" +__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default(openshift_image_tag) }}" diff --git a/roles/openshift_logging_curator/vars/openshift-enterprise.yml b/roles/openshift_logging_curator/vars/openshift-enterprise.yml index 79cf131fd..e0507fe3c 100644 --- a/roles/openshift_logging_curator/vars/openshift-enterprise.yml +++ b/roles/openshift_logging_curator/vars/openshift-enterprise.yml @@ -1,3 +1,3 @@ --- __openshift_logging_curator_image_prefix: "{{ openshift_logging_image_prefix | default('registry.access.redhat.com/openshift3/') }}" -__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default ('v3.7') }}" +__openshift_logging_curator_image_version: "{{ openshift_logging_image_version | default (openshift_image_tag) }}" |