summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-28 14:51:15 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-28 14:51:15 -0500
commitb88c68ae778574ee617fdd5db51dc8e9ec22d954 (patch)
treeb0c2f94c14f66ef4fd41a87b7c27fb6d1484253e /playbooks/common
parentb42664e6f0bf137a10123a8d99567700440c8c5d (diff)
parentd31245bd59d7613477695d7f4d49885c243ba712 (diff)
downloadopenshift-b88c68ae778574ee617fdd5db51dc8e9ec22d954.tar.gz
openshift-b88c68ae778574ee617fdd5db51dc8e9ec22d954.tar.bz2
openshift-b88c68ae778574ee617fdd5db51dc8e9ec22d954.tar.xz
openshift-b88c68ae778574ee617fdd5db51dc8e9ec22d954.zip
Merge pull request #1288 from abutcher/container-logrotate
Configure logrotate on atomic.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-etcd/config.yml1
-rw-r--r--playbooks/common/openshift-master/config.yml1
-rw-r--r--playbooks/common/openshift-node/config.yml1
3 files changed, 0 insertions, 3 deletions
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index 9473340a1..d23a54511 100644
--- a/playbooks/common/openshift-etcd/config.yml
+++ b/playbooks/common/openshift-etcd/config.yml
@@ -89,7 +89,6 @@
roles:
- etcd
- role: nickhammond.logrotate
- when: not openshift.common.is_atomic | bool
- name: Delete temporary directory on localhost
hosts: localhost
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index cb885d80a..a0d21451f 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -338,7 +338,6 @@
roles:
- openshift_master
- role: nickhammond.logrotate
- when: not openshift.common.is_atomic | bool
- role: fluentd_master
when: openshift.common.use_fluentd | bool
- role: nuage_master
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 975bfe7b4..dc3c25107 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -214,7 +214,6 @@
- role: nuage_node
when: openshift.common.use_nuage | bool
- role: nickhammond.logrotate
- when: not openshift.common.is_atomic | bool
- role: fluentd_node
when: openshift.common.use_fluentd | bool
tasks: