diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
| commit | 81cb935e1817df4c633397680e963d635ed42e26 (patch) | |
| tree | dd595fab3ae4cc8f5d47dcc2297ff34def6f571c /inventory/byo | |
| parent | 0514bdffca4e06144f4f81db037490d2c0fede40 (diff) | |
| parent | 6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff) | |
| download | openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2 openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz openshift-81cb935e1817df4c633397680e963d635ed42e26.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts.aep.example | 4 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index defd53d43..1e050f0f6 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -72,10 +72,8 @@ deployment_type=atomic-enterprise # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True # Items added, as is, to end of /etc/sysconfig/docker OPTIONS +# Default value: "--log-driver=json-file --log-opt max-size=50m" #openshift_docker_options="-l warn --ipv6=false" -# Deprecated methods to set --log-driver and --log-opts flags, use openshift_docker_options instead -#openshift_docker_log_driver=json -#openshift_docker_log_options=["tag=mailer"] # Alternate image format string. If you're not modifying the format string and # only need to inject your own registry you may want to consider diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index b153e73fd..104c64c23 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -73,10 +73,8 @@ deployment_type=origin # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True # Items added, as is, to end of /etc/sysconfig/docker OPTIONS +# Default value: "--log-driver=json-file --log-opt max-size=50m" #openshift_docker_options="-l warn --ipv6=false" -# Deprecated methods to set --log-driver and --log-opts flags, use openshift_docker_options instead -#openshift_docker_log_driver=json -#openshift_docker_log_options=["tag=mailer"] # Alternate image format string. If you're not modifying the format string and # only need to inject your own registry you may want to consider diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index d0f5c4c52..ebac28fc6 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -72,11 +72,8 @@ deployment_type=openshift-enterprise # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True # Items added, as is, to end of /etc/sysconfig/docker OPTIONS +# Default value: "--log-driver=json-file --log-opt max-size=50m" #openshift_docker_options="-l warn --ipv6=false" -# Deprecated methods to set --log-driver and --log-opts flags, use openshift_docker_options instead -#openshift_docker_log_driver=json -#openshift_docker_log_options=["tag=mailer"] - # Alternate image format string. If you're not modifying the format string and # only need to inject your own registry you may want to consider |