summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-06-02 11:25:06 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-06-02 13:59:26 -0400
commitf94e1c63c31b736d2335ab31f3a5a36c1cca3dfd (patch)
treec27c14f15d0d3e5c3cdeef3263b56cbfd8f7f738 /inventory/byo
parentc4c6685855a9dc6b4c698465b799c72d6a4f13bd (diff)
downloadopenshift-f94e1c63c31b736d2335ab31f3a5a36c1cca3dfd.tar.gz
openshift-f94e1c63c31b736d2335ab31f3a5a36c1cca3dfd.tar.bz2
openshift-f94e1c63c31b736d2335ab31f3a5a36c1cca3dfd.tar.xz
openshift-f94e1c63c31b736d2335ab31f3a5a36c1cca3dfd.zip
Configure default docker logging options.
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.aep.example4
-rw-r--r--inventory/byo/hosts.origin.example4
-rw-r--r--inventory/byo/hosts.ose.example5
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