diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-17 16:05:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 16:05:14 -0500 |
| commit | 3e8d87beaa2adc2d6f8a9e1bcc0c6cba1090acbe (patch) | |
| tree | 12c931290b6cffe8a1a17c04f67bbd7861c3915f /inventory | |
| parent | 31ac96c8d3b467e24ab4c60364cb1eb04132c348 (diff) | |
| parent | 60d6ae9a9b01586a6b686f762276831561086384 (diff) | |
| download | openshift-3e8d87beaa2adc2d6f8a9e1bcc0c6cba1090acbe.tar.gz openshift-3e8d87beaa2adc2d6f8a9e1bcc0c6cba1090acbe.tar.bz2 openshift-3e8d87beaa2adc2d6f8a9e1bcc0c6cba1090acbe.tar.xz openshift-3e8d87beaa2adc2d6f8a9e1bcc0c6cba1090acbe.zip | |
Merge pull request #3701 from ewolinetz/cherrypick_3689
Merged by openshift-bot
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 12 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 20764fb95..033ce8a82 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -494,6 +494,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # your cloud platform use this. #openshift_hosted_metrics_storage_kind=dynamic # +# Other Metrics Options -- Common items you may wish to reconfigure, for the complete +# list of options please see roles/openshift_metrics/README.md +# # Override metricsPublicURL in the master config for cluster metrics # Defaults to https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics # Currently, you may only alter the hostname portion of the url, alterting the @@ -540,14 +543,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # # Configure loggingPublicURL in the master config for aggregate logging, defaults # to kibana.{{ openshift_master_default_subdomain }} -#openshift_master_logging_public_url=kibana.example.com +#openshift_hosted_logging_hostname=logging.apps.example.com # Configure the number of elastic search nodes, unless you're using dynamic provisioning # this value must be 1 #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_hosted_logging_deployer_prefix=registry.example.com:8888/openshift3/ -#openshift_hosted_logging_deployer_version=3.3.0 +# Configure the prefix and version for the component images +#openshift_hosted_logging_deployer_prefix=docker.io/openshift/origin- +#openshift_hosted_logging_deployer_version=1.5.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 3b9861a1d..49bcb7405 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -495,6 +495,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # your cloud platform use this. #openshift_hosted_metrics_storage_kind=dynamic # +# Other Metrics Options -- Common items you may wish to reconfigure, for the complete +# list of options please see roles/openshift_metrics/README.md +# # Override metricsPublicURL in the master config for cluster metrics # Defaults to https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics # Currently, you may only alter the hostname portion of the url, alterting the @@ -541,14 +544,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # # Configure loggingPublicURL in the master config for aggregate logging, defaults # to kibana.{{ openshift_master_default_subdomain }} -#openshift_master_logging_public_url=kibana.example.com +#openshift_hosted_logging_hostname=logging.apps.example.com # Configure the number of elastic search nodes, unless you're using dynamic provisioning # this value must be 1 #openshift_hosted_logging_elasticsearch_cluster_size=1 -#openshift_hosted_logging_hostname=logging.apps.example.com -# Configure the prefix and version for the deployer image +# Configure the prefix and version for the component images #openshift_hosted_logging_deployer_prefix=registry.example.com:8888/openshift3/ -#openshift_hosted_logging_deployer_version=3.3.0 +#openshift_hosted_logging_deployer_version=3.5.0 # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet') # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant' |