summaryrefslogtreecommitdiffstats
path: root/inventory/byo/hosts.aep.example
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-15 16:39:26 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-15 16:39:26 -0500
commit0825b8327a1c509337e5c91c3b8cf6a63816782c (patch)
tree6f38679b5ed2f7f359e6c1f85478fcfa7072fdfe /inventory/byo/hosts.aep.example
parentef56d0297d29dd0d65e8912daa1ede67c4d46516 (diff)
parent6f5a98a13251b7017d9be60603c31f46ff2dc5d1 (diff)
downloadopenshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.tar.gz
openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.tar.bz2
openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.tar.xz
openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.zip
Merge pull request #1404 from sdodson/docker-options
Add openshift_docker_options to append arbitrary options to
Diffstat (limited to 'inventory/byo/hosts.aep.example')
-rw-r--r--inventory/byo/hosts.aep.example6
1 files changed, 6 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index a2e1708d4..8cd4caac4 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -58,12 +58,18 @@ deployment_type=atomic-enterprise
# See: https://docs.openshift.com/enterprise/latest/install_config/aggregate_logging.html
#openshift_master_logging_public_url=https://kibana.example.com
+# Docker Configuration
# Add additional, insecure, and blocked registries to global docker configuration
# For enterprise deployment types we ensure that registry.access.redhat.com is
# included if you do not include it
#cli_docker_additional_registries=registry.example.com
#cli_docker_insecure_registries=registry.example.com
#cli_docker_blocked_registries=registry.hacker.com
+# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
+#openshift_docker_options="-l warn --ipv6=false"
+# Deprecated methods to set --log-driver and --log-opts flags, use openshift_docker_options instead
+#cli_docker_log_driver=json
+#cli_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