diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 07:50:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 07:50:47 -0700 |
| commit | 4ac743b8fd26e02af6e230af2cbbe82dd2d4617a (patch) | |
| tree | a8602308d74cc88d39e3a6ab7a22ed98e82a2782 /roles/openshift_logging | |
| parent | 89dcad261fdf7de68c307ef9d550705ae7c96d5a (diff) | |
| parent | a0479918ccdaf2850829eea6285b30aa84a25818 (diff) | |
| download | openshift-4ac743b8fd26e02af6e230af2cbbe82dd2d4617a.tar.gz openshift-4ac743b8fd26e02af6e230af2cbbe82dd2d4617a.tar.bz2 openshift-4ac743b8fd26e02af6e230af2cbbe82dd2d4617a.tar.xz openshift-4ac743b8fd26e02af6e230af2cbbe82dd2d4617a.zip | |
Merge pull request #5494 from jcantrill/deprecate_escopy
Automatic merge from submit-queue
Remove logging ES_COPY feature
This PR removes the ES_COPY feature that has been deprecated since 3.3
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/README.md | 1 | ||||
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index f283261c4..de3d19858 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -62,7 +62,6 @@ When `openshift_logging_install_logging` is set to `False` the `openshift_loggin - `openshift_logging_fluentd_nodeselector`: The node selector that the Fluentd daemonset uses to determine where to deploy to. Defaults to '"logging-infra-fluentd": "true"'. - `openshift_logging_fluentd_cpu_limit`: The CPU limit for Fluentd pods. Defaults to '100m'. - `openshift_logging_fluentd_memory_limit`: The memory limit for Fluentd pods. Defaults to '512Mi'. -- `openshift_logging_fluentd_es_copy`: Whether or not to use the ES_COPY feature for Fluentd (DEPRECATED). Defaults to 'False'. - `openshift_logging_fluentd_use_journal`: *DEPRECATED - DO NOT USE* Fluentd will automatically detect whether or not Docker is using the journald log driver. - `openshift_logging_fluentd_journal_read_from_head`: If empty, Fluentd will use its internal default, which is false. - `openshift_logging_fluentd_hosts`: List of nodes that should be labeled for Fluentd to be deployed to. Defaults to ['--all']. diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 6699e2062..db4262fed 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -74,7 +74,6 @@ openshift_logging_kibana_ops_ca: "" openshift_logging_fluentd_nodeselector: {'logging-infra-fluentd': 'true'} openshift_logging_fluentd_cpu_limit: 100m openshift_logging_fluentd_memory_limit: 512Mi -openshift_logging_fluentd_es_copy: false openshift_logging_fluentd_journal_source: "" openshift_logging_fluentd_journal_read_from_head: "" openshift_logging_fluentd_hosts: ['--all'] |