diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-10 09:05:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 09:05:19 -0500 |
| commit | fb6e445d1c44e74c9cb769f6243b5bdd5b64374e (patch) | |
| tree | 077f4520869d484c0be9ba5b5b28f10c8584ba28 /roles/openshift_logging/README.md | |
| parent | 9e92660ed86623385e48c4960f4db681d86a7a57 (diff) | |
| parent | 10b809ffa7edad6e21744c92fe744fc45073694a (diff) | |
| download | openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.tar.gz openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.tar.bz2 openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.tar.xz openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.zip | |
Merge pull request #3281 from ewolinetz/revert_3257
Reverting commit 3257 and renaming master_url to openshift_logging_ma…
Diffstat (limited to 'roles/openshift_logging/README.md')
| -rw-r--r-- | roles/openshift_logging/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index 9394977c0..f4ec58668 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -24,8 +24,8 @@ When both `openshift_logging_install_logging` and `openshift_logging_upgrade_log - `openshift_logging_image_prefix`: The prefix for the logging images to use. Defaults to 'docker.io/openshift/origin-'. - `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'. -- `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.cluster.local'. -- `openshift_logging_master_public_url`: The public facing URL for the Kubernetes master, this is used for Authentication redirection. Defaults to 'https://localhost:8443'. +- `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_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'. |