diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-24 09:19:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 09:19:04 -0400 |
| commit | 6796a7b5bcfe391bf4affaf17c8b9a05a82be58f (patch) | |
| tree | 3ad52f5b0112fc411ac4a52f9a9a1b3a1fc8e26a /roles/openshift_metrics | |
| parent | b5570b656e59756ad6ea5b24be253f15d0e3ca41 (diff) | |
| parent | 9293059f5d331e26fc86c9fc841e2a57fcba8ae6 (diff) | |
| download | openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.tar.gz openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.tar.bz2 openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.tar.xz openshift-6796a7b5bcfe391bf4affaf17c8b9a05a82be58f.zip | |
Merge pull request #2573 from abutcher/infra-templates
Move infrastructure templates into openshift_hosted_templates role.
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_metrics/defaults/main.yml b/roles/openshift_metrics/defaults/main.yml new file mode 100644 index 000000000..a01f24df8 --- /dev/null +++ b/roles/openshift_metrics/defaults/main.yml @@ -0,0 +1,2 @@ +--- +hosted_base: "{{ openshift.common.config_base if openshift.common.is_containerized | bool else '/usr/share/openshift' }}/hosted" diff --git a/roles/openshift_metrics/tasks/install.yml b/roles/openshift_metrics/tasks/install.yml index 4dabd314f..4976c7153 100644 --- a/roles/openshift_metrics/tasks/install.yml +++ b/roles/openshift_metrics/tasks/install.yml @@ -70,7 +70,7 @@ - name: Build metrics deployer command set_fact: deployer_cmd: "{{ openshift.common.client_binary }} process -f \ - {{ metrics_template_dir }}/metrics-deployer.yaml -v \ + {{ hosted_base }}/metrics-deployer.yaml -v \ HAWKULAR_METRICS_HOSTNAME={{ metrics_hostname }},USE_PERSISTENT_STORAGE={{metrics_persistence | string | lower }},DYNAMICALLY_PROVISION_STORAGE={{metrics_dynamic_vol | 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 }} \ |