diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-02 03:58:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 03:58:02 -0400 |
commit | beb5deaedb105acd113807597858069a38553952 (patch) | |
tree | d2c08851aaa3a332d9f5acc1f7384c91224662d7 /roles/openshift_logging_mux | |
parent | 4b8e77af233a13eef17aaab13a0f0ff06cb423f4 (diff) | |
parent | ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f (diff) | |
download | openshift-beb5deaedb105acd113807597858069a38553952.tar.gz openshift-beb5deaedb105acd113807597858069a38553952.tar.bz2 openshift-beb5deaedb105acd113807597858069a38553952.tar.xz openshift-beb5deaedb105acd113807597858069a38553952.zip |
Merge pull request #4916 from richm/mux-client-mode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_mux')
-rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 1 | ||||
-rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 35fc7146f..7a3da9b4c 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -28,6 +28,7 @@ openshift_logging_mux_journal_source: "{{ openshift_hosted_logging_journal_sourc openshift_logging_mux_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}" openshift_logging_mux_allow_external: False +openshift_logging_use_mux: "{{ openshift_logging_mux_allow_external | default(False) }}" openshift_logging_mux_hostname: "{{ 'mux.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true)) }}" openshift_logging_mux_port: 24284 # the namespace to use for undefined projects should come first, followed by any diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index e43d9d397..70afe5cee 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -101,8 +101,6 @@ spec: value: "{{ openshift_logging_mux_port }}" - name: USE_MUX value: "true" - - name: MUX_ALLOW_EXTERNAL - value: "{{ openshift_logging_mux_allow_external | default('false') | lower }}" - name: "BUFFER_QUEUE_LIMIT" value: "{{ openshift_logging_mux_buffer_queue_limit }}" - name: "BUFFER_SIZE_LIMIT" |