diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-06 16:26:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 16:26:29 -0500 |
| commit | 41ff6013a19c77fdc35adcf58ad523069f20ee2f (patch) | |
| tree | 5e111d8651ac4bbf8ed979ee90c973ae6496f056 /inventory | |
| parent | 5c40085f671cd1c0d21303304be7346e91a54248 (diff) | |
| parent | b53e69588296800998f2256d66a74080ebc1e4f1 (diff) | |
| download | openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.gz openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.bz2 openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.xz openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.zip | |
Merge pull request #3257 from jcantrill/bz1417261_deployer_with_35
fixes 1417261. Points playbooks to the correct 3.5 roles for logging …
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 10 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index f24cfc737..83cfc617f 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -468,18 +468,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_hosted_logging_elasticsearch_cluster_size=1 -#openshift_hosted_logging_hostname=logging.apps.example.com +#openshift_logging_es_cluster_size=1 +#openshift_logging_kibana_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 +#openshift_logging_image_prefix=registry.example.com:8888/openshift3/ +#openshift_logging_image_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 b48776304..12f957170 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -475,11 +475,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_hosted_logging_elasticsearch_cluster_size=1 -#openshift_hosted_logging_hostname=logging.apps.example.com +#openshift_logging_es_cluster_size=1 +#openshift_logging_kibana_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 +#openshift_logging_image_prefix=registry.example.com:8888/openshift3/ +#openshift_logging_image_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' |