summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates/daemon.json
Commit message (Collapse)AuthorAgeFilesLines
* Remove userland-proxy-path from daemon.jsonSteve Milner2017-05-121-2/+1
| | | | | This flag is currently being set within the system container via the init.sh
* Remove unused daemon.json keysSteve Milner2017-05-111-45/+0
| | | | | | Instead of providing every possible key in the daemon.json configuration file, this update only provides keys which are actively set/used by the installer.
* lower case in /etc/daemon.json and correct block-registryGan Huang2017-05-111-2/+2
|
* Rename blocked-registries to block-registriesSteve Milner2017-05-101-1/+1
| | | | | The daemon.json configuration key is block-registries. The code and installer bits call it blocked-registries.
* Ensure true is lowercase in daemon.jsonSteve Milner2017-05-101-1/+1
|
* Use local variables for daemon.json templateSteve Milner2017-05-081-6/+6
| | | | | | | | | | | Instead of using bare lists and dicts this change converts variables into json for use with daemon.json. jinja2 does have an ability to do this in side of templates, however it is only available in 2.9+. Until then the use of ansible's to_json in the playbook is being used. Refs: - http://jinja.pocoo.org/docs/2.9/templates/#tojson - http://docs.ansible.com/ansible/playbooks_filters.html#filters-for-formatting-data
* Fix 1448368, and some other minors issuesGan Huang2017-05-051-1/+3
|
* System container dockerSteve Milner2017-05-031-0/+64
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