diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-30 13:56:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 13:56:59 -0400 |
| commit | a5986f46b1249e38fc4ff8bab25b911fc51f4ada (patch) | |
| tree | 4ea87b6aa1cbfc4f92339f4843614dee0ee81c83 | |
| parent | c4897a30e945b651d3a447705a54391d309c4ecb (diff) | |
| parent | cdde310ce452ee7decbe8d991674c0a80dfd9e90 (diff) | |
| download | openshift-a5986f46b1249e38fc4ff8bab25b911fc51f4ada.tar.gz openshift-a5986f46b1249e38fc4ff8bab25b911fc51f4ada.tar.bz2 openshift-a5986f46b1249e38fc4ff8bab25b911fc51f4ada.tar.xz openshift-a5986f46b1249e38fc4ff8bab25b911fc51f4ada.zip | |
Merge pull request #2384 from sdodson/metrics
Change how we set master's metricsPublicURL
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master_facts/vars/main.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install.yml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 17c31ec05..701460bb7 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -80,3 +80,4 @@ api_env_vars: "{{ openshift_master_api_env_vars | default(None) }}" controllers_env_vars: "{{ openshift_master_controllers_env_vars | default(None) }}" audit_config: "{{ openshift_master_audit_config | default(None) }}" + metrics_public_url: "{% if openshift_hosted_metrics_deploy | default(false) %}https://{{ metrics_hostname }}/hawkular/metrics{% endif %}" diff --git a/roles/openshift_master_facts/vars/main.yml b/roles/openshift_master_facts/vars/main.yml index 086d8340c..0646004b3 100644 --- a/roles/openshift_master_facts/vars/main.yml +++ b/roles/openshift_master_facts/vars/main.yml @@ -17,4 +17,9 @@ builddefaults_yaml: - name: https_proxy value: "{{ openshift.master.builddefaults_https_proxy | default(omit, true) }}" - name: no_proxy - value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}"
\ No newline at end of file + value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}" + +metrics_hostname: "{{ openshift.hosted.metrics.public_url + | default('hawkular-metrics.' ~ (openshift.master.default_subdomain + | default(openshift_master_default_subdomain ))) + | oo_hostname_from_url }}" diff --git a/roles/openshift_metrics/tasks/install.yml b/roles/openshift_metrics/tasks/install.yml index ea4f61ccd..9e254aca7 100644 --- a/roles/openshift_metrics/tasks/install.yml +++ b/roles/openshift_metrics/tasks/install.yml @@ -95,7 +95,7 @@ get {{ deploy_metrics.stdout }} register: deploy_result until: "{{ 'Completed' in deploy_result.stdout }}" - failed_when: "{{ 'Completed' not in deploy_result.stdout }}" + failed_when: False retries: 60 delay: 10 |