From 944a9b750f3765df0a204b930fe57923ca58d25d Mon Sep 17 00:00:00 2001 From: Alberto Peon Date: Tue, 13 Dec 2016 14:34:35 +0100 Subject: Set metrics url even if metrics_deploy is false --- roles/openshift_master_facts/tasks/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'roles/openshift_master_facts') 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: -- cgit v1.2.3