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 /inventory | |
| 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 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 8 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index a4a01670a..7741730ad 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -488,11 +488,11 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_master_logging_public_url=https://kibana.example.com # Configure the number of elastic search nodes, unless you're using dynamic provisioning # this value must be 1 -#openshift_logging_es_cluster_size=1 -#openshift_logging_kibana_hostname=logging.apps.example.com +#openshift_hosted_logging_elasticsearch_cluster_size=1 +#openshift_hosted_logging_hostname=logging.apps.example.com # Configure the prefix and version for the deployer image -#openshift_logging_image_prefix=registry.example.com:8888/openshift3/ -#openshift_logging_image_version=3.3.0 +#openshift_hosted_logging_deployer_prefix=registry.example.com:8888/openshift3/ +#openshift_hosted_logging_deployer_version=3.3.0 # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet') # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant' diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 91ebf9936..3da9be081 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -482,18 +482,18 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # pods are deleted # # Other Logging Options -- Common items you may wish to reconfigure, for the complete -# list of options please see roles/openshift_hosted_logging/README.md +# list of options please see roles/openshift_logging/README.md # # Configure loggingPublicURL in the master config for aggregate logging, defaults # to https://kibana.{{ openshift_master_default_subdomain }} #openshift_master_logging_public_url=https://kibana.example.com # Configure the number of elastic search nodes, unless you're using dynamic provisioning # this value must be 1 -#openshift_logging_es_cluster_size=1 -#openshift_logging_kibana_hostname=logging.apps.example.com +#openshift_hosted_logging_elasticsearch_cluster_size=1 +#openshift_hosted_logging_hostname=logging.apps.example.com # Configure the prefix and version for the deployer image -#openshift_logging_image_prefix=registry.example.com:8888/openshift3/ -#openshift_logging_image_version=3.3.0 +#openshift_hosted_logging_deployer_prefix=registry.example.com:8888/openshift3/ +#openshift_hosted_logging_deployer_version=3.3.0 # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet') # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant' |