summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates/systemcontainercustom.conf.j2
Commit message (Collapse)AuthorAgeFilesLines
* systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano2017-05-171-3/+3
| | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1451187 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
|
* Default to iptables on masterScott Dodson2017-05-101-1/+1
| | | | | | We did this in 3.5 but never on master and we never came back to add migration support. So we'll revert this on master and if/when we add migration support we'll switch the default.
* Fix 1448368, and some other minors issuesGan Huang2017-05-051-3/+3
|
* System container dockerSteve Milner2017-05-031-0/+17
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