summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlberto Peon <alberto.rodriguez.peon@cern.ch>2016-12-13 14:34:35 +0100
committerAlberto Peon <alberto.rodriguez.peon@cern.ch>2017-01-20 14:09:33 +0100
commit944a9b750f3765df0a204b930fe57923ca58d25d (patch)
tree9e7858d03bb65ade6cf84e0cfdfc170702b4c214
parentc995e1273811a24211ccc8a7e31bd793728d0f74 (diff)
downloadopenshift-944a9b750f3765df0a204b930fe57923ca58d25d.tar.gz
openshift-944a9b750f3765df0a204b930fe57923ca58d25d.tar.bz2
openshift-944a9b750f3765df0a204b930fe57923ca58d25d.tar.xz
openshift-944a9b750f3765df0a204b930fe57923ca58d25d.zip
Set metrics url even if metrics_deploy is false
-rw-r--r--roles/openshift_hosted_metrics/tasks/install.yml2
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
-rw-r--r--roles/openshift_master_facts/tasks/main.yml5
3 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_hosted_metrics/tasks/install.yml b/roles/openshift_hosted_metrics/tasks/install.yml
index 2c839996e..6a442cefc 100644
--- a/roles/openshift_hosted_metrics/tasks/install.yml
+++ b/roles/openshift_hosted_metrics/tasks/install.yml
@@ -128,5 +128,5 @@
modify_yaml:
dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
yaml_key: assetConfig.metricsPublicURL
- yaml_value: "{{ openshift_hosted_metrics_public_url }}"
+ yaml_value: "{{ openshift_hosted_metrics_deploy_url }}"
notify: restart master
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index fcb8125e9..cf7ceacff 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -15,8 +15,8 @@ assetConfig:
{% if 'logging_public_url' in openshift.master %}
loggingPublicURL: {{ openshift.master.logging_public_url }}
{% endif %}
-{% if openshift_hosted_metrics_deploy | default(false) | bool %}
- metricsPublicURL: {{ openshift_hosted_metrics_public_url }}
+{% if openshift_hosted_metrics_deploy_url is defined %}
+ metricsPublicURL: {{ openshift_hosted_metrics_deploy_url }}
{% endif %}
{% if 'extension_scripts' in openshift.master %}
extensionScripts: {{ openshift.master.extension_scripts | to_padded_yaml(1, 2) }}
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: