diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-18 13:50:50 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-18 13:50:50 -0400 |
| commit | c5df39ca2b6f493d07cf732d517c0cabc0d4098c (patch) | |
| tree | db759751e302ec8d9066a571cbf86f7ed1c5bd82 /roles | |
| parent | e562f47211c1c4f540ec0db9b0776fc3c15f39f4 (diff) | |
| parent | 9cf7ea5838ea7cbf0ec81f7bab49217cd190c0e6 (diff) | |
| download | openshift-c5df39ca2b6f493d07cf732d517c0cabc0d4098c.tar.gz openshift-c5df39ca2b6f493d07cf732d517c0cabc0d4098c.tar.bz2 openshift-c5df39ca2b6f493d07cf732d517c0cabc0d4098c.tar.xz openshift-c5df39ca2b6f493d07cf732d517c0cabc0d4098c.zip | |
Merge pull request #1911 from jdnieto/fix_hawkular_variable_templates
fixed issue with blank spaces instead commas
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index ca29ad6e1..bee1bab90 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -44,9 +44,8 @@ shell: > {{ openshift.common.client_binary }} process -f \ /usr/share/openshift/examples/infrastructure-templates/{{ hawkular_type }}/metrics-deployer.yaml -v \ - HAWKULAR_METRICS_HOSTNAME=hawkular-metrics.{{ openshift.master.default_subdomain }} USE_PERSISTENT_STORAGE={{ hawkular_persistence }} \ - METRIC_DURATION={{ openshift.hosted.metrics.duration }} METRIC_RESOLUTION={{ openshift.hosted.metrics.resolution }} | - {{ openshift.common.client_binary }} create -n openshift-infra --config={{hawkular_tmp_conf}} -f - + HAWKULAR_METRICS_HOSTNAME=hawkular-metrics.{{ openshift.master.default_subdomain }},USE_PERSISTENT_STORAGE={{ hawkular_persistence }},METRIC_DURATION={{ openshift.hosted.metrics.duration }},METRIC_RESOLUTION={{ openshift.hosted.metrics.resolution }} \ + | {{ openshift.common.client_binary }} create -n openshift-infra --config={{hawkular_tmp_conf}} -f - register: oex_heapster_services failed_when: "'already exists' not in oex_heapster_services.stderr and oex_heapster_services.rc != 0" changed_when: false |