diff options
author | Alberto Peon <alberto.rodriguez.peon@cern.ch> | 2016-12-13 14:34:35 +0100 |
---|---|---|
committer | Alberto Peon <alberto.rodriguez.peon@cern.ch> | 2017-01-20 14:09:33 +0100 |
commit | 944a9b750f3765df0a204b930fe57923ca58d25d (patch) | |
tree | 9e7858d03bb65ade6cf84e0cfdfc170702b4c214 /roles/openshift_master_facts | |
parent | c995e1273811a24211ccc8a7e31bd793728d0f74 (diff) | |
download | openshift-944a9b750f3765df0a204b930fe57923ca58d25d.tar.gz openshift-944a9b750f3765df0a204b930fe57923ca58d25d.tar.bz2 openshift-944a9b750f3765df0a204b930fe57923ca58d25d.tar.xz openshift-944a9b750f3765df0a204b930fe57923ca58d25d.zip |
Set metrics url even if metrics_deploy is false
Diffstat (limited to 'roles/openshift_master_facts')
-rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 0dba4b3ba..74885d713 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -21,11 +21,10 @@ g_metrics_hostname: "{{ openshift_hosted_metrics_public_url | default('hawkular-metrics.' ~ (openshift_master_default_subdomain)) | oo_hostname_from_url }}" - when: openshift_hosted_metrics_deploy | default(false) | bool - set_fact: - openshift_hosted_metrics_public_url: "https://{{ g_metrics_hostname }}/hawkular/metrics" - when: openshift_hosted_metrics_deploy | default(false) | bool + openshift_hosted_metrics_deploy_url: "https://{{ g_metrics_hostname }}/hawkular/metrics" + when: (openshift_hosted_metrics_deploy | default(false) | bool) or (openshift_hosted_metrics_public_url is defined) - name: Set master facts openshift_facts: |