diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-03 16:06:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 16:06:16 -0500 |
| commit | 01135c08c46c3674f93123833bc14ba4aa661fe0 (patch) | |
| tree | 6033f586a27e4b7778bd52540768203bdde7ab1d /inventory | |
| parent | 850bb25200db1488f66c15d9a49cfb8dbc09946a (diff) | |
| parent | 44115530148069e200e3a5d92b00e981aaa6e824 (diff) | |
| download | openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.gz openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.bz2 openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.xz openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.zip | |
Merge pull request #4049 from ashcrow/system-container-docker
Merged by openshift-bot
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 12 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index d31c35f69..db6ac12ce 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -78,6 +78,18 @@ openshift_release=v1.5 #openshift_docker_blocked_registries=registry.hacker.com # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True +# Use Docker inside a System Container. Note that this is a tech preview and should +# not be used to upgrade! +# The following options for docker are ignored: +# - docker_version +# - docker_upgrade +# The following options must not be used +# - openshift_docker_options +#openshift_docker_use_system_container=False +# Force the registry to use for the system container. By default the registry +# will be built off of the deployment type and ansible_distribution. Only +# use this option if you are sure you know what you are doing! +#openshift_docker_systemcontainer_image_registry_override="registry.example.com" # Items added, as is, to end of /etc/sysconfig/docker OPTIONS # Default value: "--log-driver=journald" #openshift_docker_options="-l warn --ipv6=false" diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 80cc65f06..42097a593 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -78,6 +78,18 @@ openshift_release=v3.5 #openshift_docker_blocked_registries=registry.hacker.com # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True +# Use Docker inside a System Container. Note that this is a tech preview and should +# not be used to upgrade! +# The following options for docker are ignored: +# - docker_version +# - docker_upgrade +# The following options must not be used +# - openshift_docker_options +#openshift_docker_use_system_container=False +# Force the registry to use for the system container. By default the registry +# will be built off of the deployment type and ansible_distribution. Only +# use this option if you are sure you know what you are doing! +#openshift_docker_systemcontainer_image_registry_override="registry.example.com" # Items added, as is, to end of /etc/sysconfig/docker OPTIONS # Default value: "--log-driver=journald" #openshift_docker_options="-l warn --ipv6=false" |