diff options
| author | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-10-01 10:57:14 -0700 |
|---|---|---|
| committer | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-10-01 10:57:14 -0700 |
| commit | 7be731dd7a0a5cfb5949d53a896ebd282aa7303f (patch) | |
| tree | 568f0480e0c95e7126203baf6290a89210eceda6 | |
| parent | e2ad79c715ee494b28205fc4abd98a54e57e57e2 (diff) | |
| parent | 7748ce4463ca6d2e31b55c81ffc1418f8a999b55 (diff) | |
| download | openshift-7be731dd7a0a5cfb5949d53a896ebd282aa7303f.tar.gz openshift-7be731dd7a0a5cfb5949d53a896ebd282aa7303f.tar.bz2 openshift-7be731dd7a0a5cfb5949d53a896ebd282aa7303f.tar.xz openshift-7be731dd7a0a5cfb5949d53a896ebd282aa7303f.zip | |
Merge pull request #644 from dak1n1/logrotate
added 'missingok' to logrotate and disabled fluentd in online
| -rw-r--r-- | playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 1 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml index b77bcdc1a..9c699120b 100644 --- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml @@ -172,6 +172,7 @@ - rotate 7 - compress - sharedscripts + - missingok scripts: postrotate: "/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true" diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index f708f9bac..3ab3663de 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -296,9 +296,8 @@ def set_fluentd_facts_if_unset(facts): """ if 'common' in facts: - deployment_type = facts['common']['deployment_type'] if 'use_fluentd' not in facts['common']: - use_fluentd = True if deployment_type == 'online' else False + use_fluentd = False facts['common']['use_fluentd'] = use_fluentd return facts |