diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:22:13 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:22:13 -0400 |
| commit | 238171804159ca5127b0a4d419bc7489b0fa8ab4 (patch) | |
| tree | 9777b16283726b27cb23cc682e68305de6bc1cb3 /inventory/byo/hosts.ose.example | |
| parent | 00ccce6741369f5cffdcca2a9511c57e3aff4b47 (diff) | |
| parent | 8f7b31051dae0cdb853ca2f7fb68c31a40ae2967 (diff) | |
| download | openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.gz openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.bz2 openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.tar.xz openshift-238171804159ca5127b0a4d419bc7489b0fa8ab4.zip | |
Merge pull request #1550 from detiber/docker_refactor
Docker role refactor
Diffstat (limited to 'inventory/byo/hosts.ose.example')
| -rw-r--r-- | inventory/byo/hosts.ose.example | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index b51569e68..b931a684d 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -62,19 +62,21 @@ deployment_type=openshift-enterprise # 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 +#openshift_docker_additional_registries=registry.example.com +#openshift_docker_insecure_registries=registry.example.com +#openshift_docker_blocked_registries=registry.hacker.com +# Disable pushing to dockerhub +#openshift_docker_disable_push_dockerhub=True # 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" +#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 -# cli_docker_additional_registries instead +# openshift_docker_additional_registries instead #oreg_url=example.com/openshift3/ose-${component}:${version} # Additional yum repos to install |