diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-26 18:01:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 18:01:31 -0400 |
| commit | 9dfd967f81a3ab02ed5c55586e9746ca697763fa (patch) | |
| tree | ac4ae858ef7906a7f9cf14bf8a82701a2ac66c91 /roles | |
| parent | f05d7c1f74c13dc7bcd46718a1eee0586055f326 (diff) | |
| parent | b4669c1d9a0edf30caeadf03cc49197e0ef9d55d (diff) | |
| download | openshift-9dfd967f81a3ab02ed5c55586e9746ca697763fa.tar.gz openshift-9dfd967f81a3ab02ed5c55586e9746ca697763fa.tar.bz2 openshift-9dfd967f81a3ab02ed5c55586e9746ca697763fa.tar.xz openshift-9dfd967f81a3ab02ed5c55586e9746ca697763fa.zip | |
Merge pull request #2369 from sdodson/metrics
Additional metrics improvements
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_metrics/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/roles/openshift_metrics/tasks/install.yml b/roles/openshift_metrics/tasks/install.yml index 2fbb7d606..ea4f61ccd 100644 --- a/roles/openshift_metrics/tasks/install.yml +++ b/roles/openshift_metrics/tasks/install.yml @@ -74,7 +74,7 @@ HAWKULAR_METRICS_HOSTNAME={{ metrics_hostname }},USE_PERSISTENT_STORAGE={{metrics_persistence | string | lower }},METRIC_DURATION={{ openshift.hosted.metrics.duration }},METRIC_RESOLUTION={{ openshift.hosted.metrics.resolution }}{{ image_prefix }}{{ image_version }},MODE={{ deployment_mode }} \ | {{ openshift.common.client_binary }} --namespace openshift-infra \ --config={{ openshift_metrics_kubeconfig }} \ - create -f -" + create -o name -f -" - name: Deploy Metrics shell: "{{ deployer_cmd }}" diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index 8a6712468..ad04bc355 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -33,10 +33,9 @@ | default('hawkular-metrics.' ~ (openshift.master.default_subdomain | default(openshift_master_default_subdomain ))) | oo_hostname_from_url }}" - metrics_persistence: True - #"{{ openshift.hosted.metrics.storage_kind | default(none) is not none }}" + metrics_persistence: "{{ openshift.hosted.metrics.storage_kind | default(none) is not none }}" metrics_dynamic_vol: "{{ openshift.hosted.metrics.storage_kind | default(none) == 'dynamic' }}" - metrics_template_dir: "/usr/share/openshift/examples/infrastructure-templates/{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}" + metrics_template_dir: "{{ openshift.common.config_base if openshift.common.is_containerized | bool else '/usr/share/openshift' }}/examples/infrastructure-templates/{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}" cassandra_nodes: "{{ ',CASSANDRA_NODES=' ~ openshift.hosted.metrics.cassandra_nodes if 'cassandra' in openshift.hosted.metrics else '' }}" cassandra_pv_size: "{{ ',CASSANDRA_PV_SIZE=' ~ openshift.hosted.metrics.storage_volume_size if openshift.hosted.metrics.storage_volume_size | default(none) is not none else '' }}" image_prefix: "{{ ',IMAGE_PREFIX=' ~ openshift.hosted.metrics.deployer_prefix if 'deployer_prefix' in openshift.hosted.metrics else '' }}" |