summaryrefslogtreecommitdiffstats
path: root/roles/nickhammond.logrotate
diff options
context:
space:
mode:
Diffstat (limited to 'roles/nickhammond.logrotate')
-rw-r--r--roles/nickhammond.logrotate/tasks/main.yml4
-rw-r--r--roles/nickhammond.logrotate/templates/logrotate.d.j22
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/nickhammond.logrotate/tasks/main.yml b/roles/nickhammond.logrotate/tasks/main.yml
index 657cb10ec..50ad7e373 100644
--- a/roles/nickhammond.logrotate/tasks/main.yml
+++ b/roles/nickhammond.logrotate/tasks/main.yml
@@ -1,7 +1,9 @@
---
- name: nickhammond.logrotate | Install logrotate
package: name=logrotate state=present
- when: not openshift.common.is_atomic | bool
+ when: not openshift_is_atomic | bool
+ register: result
+ until: result is succeeded
- name: nickhammond.logrotate | Setup logrotate.d scripts
template:
diff --git a/roles/nickhammond.logrotate/templates/logrotate.d.j2 b/roles/nickhammond.logrotate/templates/logrotate.d.j2
index 6453be6b2..1ad1c595c 100644
--- a/roles/nickhammond.logrotate/templates/logrotate.d.j2
+++ b/roles/nickhammond.logrotate/templates/logrotate.d.j2
@@ -7,7 +7,7 @@
{% endfor -%}
{% endif %}
{%- if item.scripts is defined -%}
- {%- for name, script in item.scripts.iteritems() -%}
+ {%- for name, script in item.scripts.items() -%}
{{ name }}
{{ script }}
endscript