From 6f5a98a13251b7017d9be60603c31f46ff2dc5d1 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 15 Feb 2016 16:09:50 -0500 Subject: Add openshift_docker_options to append arbitrary options to /etc/sysconfig/docker OPTIONS --- inventory/byo/hosts.aep.example | 6 ++++++ inventory/byo/hosts.origin.example | 6 ++++++ inventory/byo/hosts.ose.example | 7 +++++++ 3 files changed, 19 insertions(+) (limited to 'inventory/byo') 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 diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index de1d0f88b..fffdcaab4 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -59,12 +59,18 @@ deployment_type=origin # See: https://docs.openshift.org/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 diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index c80be574f..233c1c8e2 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -58,12 +58,19 @@ deployment_type=openshift-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 -- cgit v1.2.3