diff options
| author | Steve Milner <smilner@redhat.com> | 2017-04-24 16:28:37 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-05-03 09:22:17 -0400 |
| commit | 44115530148069e200e3a5d92b00e981aaa6e824 (patch) | |
| tree | d2b30e5d22f58f1e9802b2f8ad7ae2a253b608d4 /inventory/byo | |
| parent | ba5c6594ade6679d055aaecc7c38836444f0f791 (diff) | |
| download | openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.gz openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.bz2 openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.xz openshift-44115530148069e200e3a5d92b00e981aaa6e824.zip | |
System container docker
This change allows for the use of either the traditional package install
of docker OR a system container install of docker.
Two new inventory options, openshift_docker_use_system_container and
openshift_docker_systemcontainer_image_registry_override, have been
added which are be used to install with a system container. By default
this option is commented out.
One new fact has been added:
- docker.service_name: docker by default, container-engine-docker
for system container
Diffstat (limited to 'inventory/byo')
| -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" |