summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates
Commit message (Collapse)AuthorAgeFilesLines
* Implement container runtime roleMichael Gugino2017-12-017-265/+0
|
* crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: Set max log size to 50 mbMrunal Patel2017-10-271-1/+1
| | | | Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
* Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptablesScott Dodson2017-10-091-0/+6
|\ | | | | Add PartOf to docker systemd service unit.
| * Add PartOf to docker systemd service unit.Michael Gugino2017-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if iptables service is restarted, existing iptables rules are removed. Docker adds iptables rules dyanmically upon startup and container creation. Restarting the iptables service results in a loss of these needed iptables rules. This commit ensures that if iptables service is restarted by anisble or the user, docker is also restarted. This ensures the proper dynamic iptables rules are in place for docker. Fixes: openshift/origin#16709
* | crio: use systemd managerGiuseppe Scrivano2017-10-091-1/+1
|/ | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* crio.conf.j2: sync from upstreamGiuseppe Scrivano2017-10-061-1/+23
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: use overlay instead of overlay2Giuseppe Scrivano2017-10-061-2/+2
| | | | | | | overlay2 and overlay are the same driver. Upstream CRI-O is going to drop any reference to overlay2 and use only overlay. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Fix typo in files (Docker registries)William Burton2017-09-291-1/+1
|
* Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-211-0/+46
| | | | | | | | This commit moves additional/block/insecure registries to /etc/containers/registries.conf and comments existing lines in /etc/sysconfig/docker. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460930
* Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot2017-09-061-0/+5
|\ | | | | Merged by openshift-bot
| * cri-o: add support for additional registriesGiuseppe Scrivano2017-08-241-0/+5
| | | | | | | | | | | | | | Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | cri-o: change to system runcGiuseppe Scrivano2017-08-251-1/+1
|/ | | | | | | Newer versions of cri-o do not carry runc but use the one from the system. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: configure the CNI networkGiuseppe Scrivano2017-08-041-0/+5
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: Ensure overlay is availableSteve Milner2017-08-031-0/+2
| | | | | | | Some distro releases may not have overlay loaded into the kernel. This change looks for overlay via lsmod and, if it isn't already there, uses modprobe to load it in and then drops a load config into /etc/modules-load.d/overlay.conf.
* cri-o: Default insecure registries to ""Steve Milner2017-08-031-1/+1
|
* crio: use a template for the configurationGiuseppe Scrivano2017-08-031-0/+132
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* 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>
* Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot2017-05-121-2/+1
|\ | | | | Merged by openshift-bot
| * 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
* | Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
|/
* 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.
* Merge pull request #4158 from ganhuang/lower_boolScott Dodson2017-05-111-2/+2
|\ | | | | lower case in /etc/daemon.json and correct block-registry
| * lower case in /etc/daemon.json and correct block-registryGan Huang2017-05-111-2/+2
| |
* | Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot2017-05-101-1/+1
|\ \ | |/ |/| Merged by openshift-bot
| * 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.
* | 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-052-4/+6
|
* System container dockerSteve Milner2017-05-032-0/+81
| | | | | | | | | | | | | | | 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
* Loosely couple docker to iptables serviceRussell Teague2017-03-071-1/+1
|
* Resolve docker and iptables service dependenciesRussell Teague2016-11-111-0/+5
The docker service adds rules to the iptables configuration to support proper network functionality for running containers. If the service is started prior to iptables, these rules are not properly created. * Ensure iptables is started prior to docker Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1390835
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 16:02:15 +0000