diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2017-05-02 14:40:11 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2017-05-31 14:36:03 -0600 |
| commit | ecb9b40a0c5d5f9353722b0373b559284cae7798 (patch) | |
| tree | a2384baea11fde08acd56897922af12c0aa8c8b1 /roles/openshift_logging/defaults | |
| parent | d175973070a4dce2055678f9309d2f74517d461e (diff) | |
| download | openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.tar.gz openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.tar.bz2 openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.tar.xz openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.zip | |
add mux docs; allow to specify mux namespaces
This adds the necessary documentation for the mux parameters and
behavior. This also adds new parameters which allow to specify
the namespaces mux must create by default, and which can be
optionally added.
This casts openshift_logging_use_mux to bool wherever it is used
as a boolean.
Also - use oc_service `labels` and `external_ips` which are now
available.
Diffstat (limited to 'roles/openshift_logging/defaults')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 837c54067..573cbdd09 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -160,8 +160,13 @@ openshift_logging_use_mux: "{{ openshift_logging_mux_allow_external | default(Fa openshift_logging_use_mux_client: False openshift_logging_mux_hostname: "{{ 'mux.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true)) }}" openshift_logging_mux_port: 24284 -openshift_logging_mux_cpu_limit: 100m -openshift_logging_mux_memory_limit: 512Mi +openshift_logging_mux_cpu_limit: 500m +openshift_logging_mux_memory_limit: 1Gi +# the namespace to use for undefined projects should come first, followed by any +# additional namespaces to create by default - users will typically not need to set this +openshift_logging_mux_default_namespaces: ["mux-undefined"] +# extra namespaces to create for mux clients - users will need to set this +openshift_logging_mux_namespaces: [] # 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 #es_logging_contents: |