summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2017-10-04 14:47:05 -0700
committerNoriko Hosoi <nhosoi@redhat.com>2017-10-10 11:55:35 -0700
commit554a9281265e0234af6a1de4142c67f5f8061de1 (patch)
tree332afb61f0fdf70cf85145e1ae8a073d7036df88 /roles
parent48126155eade2d030398f69dc5ee32838ec08480 (diff)
downloadopenshift-554a9281265e0234af6a1de4142c67f5f8061de1.tar.gz
openshift-554a9281265e0234af6a1de4142c67f5f8061de1.tar.bz2
openshift-554a9281265e0234af6a1de4142c67f5f8061de1.tar.xz
openshift-554a9281265e0234af6a1de4142c67f5f8061de1.zip
Bug 1490647 - logging-fluentd deployed with openshift_logging_use_mux=false fails to start due to missing
If openshift_logging_use_mux=False and openshift_logging_mux_allow_external=False, then all other mux related parameters should be set to False (if boolean) or removed (e.g. openshift_logging_mux_client_mode should be undefined).
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_logging_fluentd/templates/fluentd.j212
1 files changed, 9 insertions, 3 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index b5f27b60d..f286b0656 100644
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2
+++ b/roles/openshift_logging_fluentd/templates/fluentd.j2
@@ -66,7 +66,9 @@ spec:
readOnly: true
- name: filebufferstorage
mountPath: /var/lib/fluentd
-{% if openshift_logging_mux_client_mode is defined %}
+{% if openshift_logging_mux_client_mode is defined and
+ ((openshift_logging_mux_allow_external is defined and openshift_logging_mux_allow_external | bool) or
+ (openshift_logging_use_mux is defined and openshift_logging_use_mux | bool)) %}
- name: muxcerts
mountPath: /etc/fluent/muxkeys
readOnly: true
@@ -114,7 +116,9 @@ spec:
resource: limits.memory
- name: "FILE_BUFFER_LIMIT"
value: "{{ openshift_logging_fluentd_file_buffer_limit | default('1Gi') }}"
-{% if openshift_logging_mux_client_mode is defined %}
+{% if openshift_logging_mux_client_mode is defined and
+ ((openshift_logging_mux_allow_external is defined and openshift_logging_mux_allow_external | bool) or
+ (openshift_logging_use_mux is defined and openshift_logging_use_mux | bool)) %}
- name: "MUX_CLIENT_MODE"
value: "{{ openshift_logging_mux_client_mode }}"
{% endif %}
@@ -196,7 +200,9 @@ spec:
- name: dockerdaemoncfg
hostPath:
path: /etc/docker
-{% if openshift_logging_mux_client_mode is defined %}
+{% if openshift_logging_mux_client_mode is defined and
+ ((openshift_logging_mux_allow_external is defined and openshift_logging_mux_allow_external | bool) or
+ (openshift_logging_use_mux is defined and openshift_logging_use_mux | bool)) %}
- name: muxcerts
secret:
secretName: logging-mux