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_fluentd | |
| 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_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml index 30d3d854a..82326bdd1 100644 --- a/roles/openshift_logging_fluentd/defaults/main.yml +++ b/roles/openshift_logging_fluentd/defaults/main.yml @@ -50,8 +50,6 @@ openshift_logging_fluentd_aggregating_key_path: none openshift_logging_fluentd_aggregating_passphrase: none ### Deprecating in 3.6 -openshift_logging_fluentd_es_copy: false - # following can be uncommented to provide values for configmaps -- take care when providing file contents as it may cause your cluster to not operate correctly #fluentd_config_contents: #fluentd_throttle_contents: diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index 74b4d7db4..37960afd1 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/tasks/main.yaml @@ -1,5 +1,8 @@ --- - fail: + msg: The ES_COPY feature is no longer supported. Please remove the variable from your inventory + when: openshift_logging_fluentd_es_copy is defined +- fail: msg: Only one Fluentd nodeselector key pair should be provided when: openshift_logging_fluentd_nodeselector.keys() | count > 1 diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index a4afb6618..1c0d1089f 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -94,8 +94,6 @@ spec: value: "{{ openshift_logging_fluentd_ops_client_key }}" - name: "OPS_CA" value: "{{ openshift_logging_fluentd_ops_ca }}" - - name: "ES_COPY" - value: "false" - name: "JOURNAL_SOURCE" value: "{{ openshift_logging_fluentd_journal_source | default('') }}" - name: "JOURNAL_READ_FROM_HEAD" |