diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-24 12:07:15 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-24 12:07:15 -0500 |
| commit | 7cee7585ba41958d9e99fbbb56fa0d748567a770 (patch) | |
| tree | 0ec0c45509a25d7fcf17e069c55c462cc5ffa893 /roles | |
| parent | 91b3a5cfc1c86bf2a7ed8c12abaee418a3bd3b8f (diff) | |
| parent | 6c1e495bcf0ba919c3ad8d4095db12fcda918b03 (diff) | |
| download | openshift-7cee7585ba41958d9e99fbbb56fa0d748567a770.tar.gz openshift-7cee7585ba41958d9e99fbbb56fa0d748567a770.tar.bz2 openshift-7cee7585ba41958d9e99fbbb56fa0d748567a770.tar.xz openshift-7cee7585ba41958d9e99fbbb56fa0d748567a770.zip | |
Merge pull request #1096 from git001/master
Add the new metrics and logging urls v2
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 9caf15f9e..46a8cea96 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -41,6 +41,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 |