diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-14 13:23:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 13:23:39 -0500 |
| commit | b61593976cedf3946ede5b6c5cc9bd80b0747cf3 (patch) | |
| tree | 66ea8909ebb84d2a514ee4e69b4dcf4ced0f24eb | |
| parent | 8429d5a5100b5b047a393e64b3c0af73eae27c85 (diff) | |
| parent | f009580c57985a9dcb62247871f5d1650acdd45d (diff) | |
| download | openshift-b61593976cedf3946ede5b6c5cc9bd80b0747cf3.tar.gz openshift-b61593976cedf3946ede5b6c5cc9bd80b0747cf3.tar.bz2 openshift-b61593976cedf3946ede5b6c5cc9bd80b0747cf3.tar.xz openshift-b61593976cedf3946ede5b6c5cc9bd80b0747cf3.zip | |
Merge pull request #3359 from ewolinetz/logging_metrics_defaults
updating defaults for logging and metrics roles
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index bdb168921..d9eebe688 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -19,7 +19,7 @@ openshift_logging_curator_memory_limit: null openshift_logging_curator_ops_cpu_limit: 100m openshift_logging_curator_ops_memory_limit: null -openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default(kibana.{{openshift.common.dns_domain}}) }}" +openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.{{openshift.common.dns_domain}}') }}" openshift_logging_kibana_cpu_limit: null openshift_logging_kibana_memory_limit: null openshift_logging_kibana_proxy_debug: false diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index 83843f126..edaa7d0df 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -32,7 +32,7 @@ openshift_metrics_heapster_requests_memory: 0.9375G openshift_metrics_heapster_requests_cpu: null openshift_metrics_heapster_nodeselector: "" -openshift_metrics_hostname: "hawkular-metrics.{{openshift_master_default_subdomain}}" +openshift_metrics_hawkular_hostname: "hawkular-metrics.{{openshift_master_default_subdomain}}" openshift_metrics_duration: 7 openshift_metrics_resolution: 30s |