summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-04-11 16:43:05 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-04-20 15:10:51 -0300
commitb0e43e87b132594bc370419085000b6d6c54cdc6 (patch)
tree1f7e1238e4ef544e579d3774a0a8ac6bee41a6db /inventory
parent895a55c23fb7ae202ed3d6b4660f5e37410b05f2 (diff)
downloadopenshift-b0e43e87b132594bc370419085000b6d6c54cdc6.tar.gz
openshift-b0e43e87b132594bc370419085000b6d6c54cdc6.tar.bz2
openshift-b0e43e87b132594bc370419085000b6d6c54cdc6.tar.xz
openshift-b0e43e87b132594bc370419085000b6d6c54cdc6.zip
Use a JSON list for docker log options.
Previously we expected you to comma separate, but this wasn't really clear. Insted we will use an explicit JSON list going forward. The comma separated list will be supported for backwards compatability.
Diffstat (limited to 'inventory')
-rw-r--r--inventory/byo/hosts.aep.example2
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
3 files changed, 3 insertions, 3 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index c3f551401..7c98ddcd6 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -75,7 +75,7 @@ deployment_type=atomic-enterprise
#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"
+#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 caed1c6a1..ad5c77ac6 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -76,7 +76,7 @@ deployment_type=origin
#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"
+#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 557e7d8aa..7c0c71484 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -75,7 +75,7 @@ deployment_type=openshift-enterprise
#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"
+#openshift_docker_log_options=["tag=mailer"]
# Alternate image format string. If you're not modifying the format string and