summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorgit001 <git001@users.noreply.github.com>2015-12-21 15:17:23 +0100
committerala <al-git001@none.at>2015-12-22 12:32:32 +0100
commit6c1e495bcf0ba919c3ad8d4095db12fcda918b03 (patch)
tree682ff8a343f75f66348d8da1c60a12c83afa8057 /roles
parentfabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff)
downloadopenshift-6c1e495bcf0ba919c3ad8d4095db12fcda918b03.tar.gz
openshift-6c1e495bcf0ba919c3ad8d4095db12fcda918b03.tar.bz2
openshift-6c1e495bcf0ba919c3ad8d4095db12fcda918b03.tar.xz
openshift-6c1e495bcf0ba919c3ad8d4095db12fcda918b03.zip
add the necessary URLs for logging and metrics
add the necessary URLs for logging and metrics use the dict in the right way add the new variables into the hosts file add the new variables into the hosts file add the new variables into the hosts file Adopted the config text
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/tasks/main.yml2
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j26
2 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 43647cc49..e00dd0a9e 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -38,6 +38,8 @@
console_url: "{{ openshift_master_console_url | default(None) }}"
console_use_ssl: "{{ openshift_master_console_use_ssl | default(None) }}"
public_console_url: "{{ openshift_master_public_console_url | default(None) }}"
+ logging_public_url: "{{ openshift_master_logging_public_url | default(None) }}"
+ metrics_public_url: "{{ openshift_master_metrics_public_url | default(None) }}"
etcd_hosts: "{{ openshift_master_etcd_hosts | default(None)}}"
etcd_port: "{{ openshift_master_etcd_port | default(None) }}"
etcd_use_ssl: "{{ openshift_master_etcd_use_ssl | default(None) }}"
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index cadb02fa3..5f73461d4 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -8,6 +8,12 @@ assetConfig:
logoutURL: ""
masterPublicURL: {{ openshift.master.public_api_url }}
publicURL: {{ openshift.master.public_console_url }}/
+{% if 'logging_public_url' in openshift.master %}
+ loggingPublicURL: {{ openshift.master.logging_public_url }}
+{% endif %}
+{% if 'metrics_public_url' in openshift.master %}
+ metricsPublicURL: {{ openshift.master.metrics_public_url }}
+{% endif %}
servingInfo:
bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.console_port }}
bindNetwork: tcp4