diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-21 15:40:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 15:40:21 -0500 |
| commit | b718955622da88c875aa5814fd87bcb3f53599f6 (patch) | |
| tree | 8abdf68d20c0df82ca5dcdeddaa1c10c189f4212 | |
| parent | 8b27f4909d91850dad92e7bcbd660c0b674876c8 (diff) | |
| parent | 685982f372c1a71d3a2c956b0ad9e3d07aa93d94 (diff) | |
| download | openshift-b718955622da88c875aa5814fd87bcb3f53599f6.tar.gz openshift-b718955622da88c875aa5814fd87bcb3f53599f6.tar.bz2 openshift-b718955622da88c875aa5814fd87bcb3f53599f6.tar.xz openshift-b718955622da88c875aa5814fd87bcb3f53599f6.zip | |
Merge pull request #3438 from jcantrill/bz_1425321_default_api_port
Bz 1425321 default api port
| -rw-r--r-- | roles/openshift_logging/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index 9189bc2f0..c90a5bf20 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -25,7 +25,7 @@ When both `openshift_logging_install_logging` and `openshift_logging_upgrade_log - `openshift_logging_image_version`: The image version for the logging images to use. Defaults to 'latest'. - `openshift_logging_use_ops`: If 'True', set up a second ES and Kibana cluster for infrastructure logs. Defaults to 'False'. - `openshift_logging_master_url`: The URL for the Kubernetes master, this does not need to be public facing but should be accessible from within the cluster. Defaults to 'https://kubernetes.default.svc.{{openshift.common.dns_domain}}'. -- `openshift_logging_master_public_url`: The public facing URL for the Kubernetes master, this is used for Authentication redirection. Defaults to 'https://{{openshift.common.public_hostname}}:8443'. +- `openshift_logging_master_public_url`: The public facing URL for the Kubernetes master, this is used for Authentication redirection. Defaults to 'https://{{openshift.common.public_hostname}}:{{openshift.master.api_port}}'. - `openshift_logging_namespace`: The namespace that Aggregated Logging will be installed in. Defaults to 'logging'. - `openshift_logging_curator_default_days`: The default minimum age (in days) Curator uses for deleting log records. Defaults to '30'. - `openshift_logging_curator_run_hour`: The hour of the day that Curator will run at. Defaults to '0'. diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 87fc7068f..9b3c17da1 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -3,7 +3,7 @@ openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | d openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default('latest') }}" openshift_logging_use_ops: False openshift_logging_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}" -openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':8443') }}" +openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' + openshift.master.api_port) }}" openshift_logging_namespace: logging openshift_logging_install_logging: True |