summaryrefslogtreecommitdiffstats
path: root/roles/docker
Commit message (Collapse)AuthorAgeFilesLines
* docker: introduce use_crio_onlyGiuseppe Scrivano2017-08-031-2/+3
| | | | | | | | Introduce a new variable that disable the installation of Docker. For the time being we will still need Docker for building images, so by default leave it installed. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* docker: skip Docker setup when using CRI-OGiuseppe Scrivano2017-08-031-1/+3
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: use only images from Docker HubGiuseppe Scrivano2017-08-031-10/+6
| | | | | | | For the time being it won't be added to the Red Hat registry, so use only what is available on Docker Hub. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: Enable systemd-modules-load if requiredSteve Milner2017-08-031-0/+6
| | | | | If we had to drop the overlay file in /etc/modules-load.d/ then enable the systemd-modules-load service and make sure it runs.
* cri-o: Ensure overlay is availableSteve Milner2017-08-032-0/+22
| | | | | | | 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-032-1/+2
|
* crio: use a template for the configurationGiuseppe Scrivano2017-08-032-24/+137
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: Minor fixes for tasksSteve Milner2017-08-031-2/+1
|
* cri-o: Hardcode image name to cri-oSteve Milner2017-08-031-1/+1
|
* cri-o: configure storage and insecure registriesGiuseppe Scrivano2017-08-032-3/+34
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* cri-o: Allow cri-o usage.Steve Milner2017-08-032-0/+110
| | | | This change reuses the docker role to inject cri-o usage.
* Merge pull request #4757 from sosiouxme/20170703-docker-storage-overlay2Scott Dodson2017-07-201-1/+1
|\ | | | | openshift_checks/docker_storage: overlay/2 support
| * docker: fix docker_selinux_enabledLuke Meyer2017-07-181-1/+1
| | | | | | | | | | Document the option so that those who want to run on OverlayFS can find it. Fix the task so that setting it to False isn't interpreted as true.
* | Ensure proper fact evaluationScott Dodson2017-07-182-2/+2
| |
* | Wrap additional service changes in retriesScott Dodson2017-07-183-5/+15
| |
* | Test docker restart with retries 3 delay 30Steve Milner2017-07-181-1/+1
|/
* container-engine: Update Fedora registry urlSteve Milner2017-07-071-1/+1
|
* Install container-selinux with container-engineSteve Milner2017-07-061-0/+6
|
* Add a retry to the docker restart handlerScott Dodson2017-06-281-0/+5
|
* rename daemon.json to container-daemon.jsonSteve Milner2017-06-052-5/+7
| | | | | | The container-engine build has moved daemon.json to container-daemon.json to avoid collision. This change updates the template file location to follow suit.
* Add mtu setting to /etc/sysconfig/docker-networkScott Dodson2017-06-011-0/+15
| | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1457062
* Remove typos that got reintroducedSteve Milner2017-05-251-2/+2
|
* Remove system-package=no from container-engine installSteve Milner2017-05-251-2/+0
|
* Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-EnvironmentOpenShift Bot2017-05-171-3/+3
|\ | | | | Merged by openshift-bot
| * 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>
* | Add regexp for container-engine lineinfileSteve Milner2017-05-161-0/+5
| | | | | | | | | | This ensures that if the line already exists it will be updated with the expected results from the installer.
* | use dest instead of path for lineinfileSteve Milner2017-05-151-6/+6
| | | | | | | | | | | | | | Switching to dest instead of path for lineinfile. path is the name for ansible 2.3+ though dest will work for 2.2 and 2.3. Ref: http://docs.ansible.com/ansible/lineinfile_module.html
* | Add NO_PROXY workaround for container-engine atomic commandSteve Milner2017-05-151-0/+4
| | | | | | | | Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1450310
* | Add no_proxy to atomic.confSteve Milner2017-05-151-1/+9
|/ | | | Requires: https://github.com/projectatomic/atomic/pull/999
* Add docker package for container-engine installSteve Milner2017-05-141-11/+15
| | | | | The package is required so that openshift_facts is able to use the docker client to gain information on the versions.
* 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
| |
* | Always add proxy items to atomic.confSteve Milner2017-05-121-4/+1
| |
* | Move container-engine systemd environment to updated locationSteve Milner2017-05-122-2/+3
|/
* doc: Add link to daemon.json upstream docSteve Milner2017-05-111-0/+2
|
* 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-102-2/+2
|\ \ | |/ |/| Merged by openshift-bot
| * Default to iptables on masterScott Dodson2017-05-102-2/+2
| | | | | | | | | | | | 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-102-1/+2
|/
* Use local variables for daemon.json templateSteve Milner2017-05-082-6/+14
| | | | | | | | | | | 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-054-19/+22
|
* System container dockerSteve Milner2017-05-039-116/+350
| | | | | | | | | | | | | | | 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
|
* Comma separate no_proxy host list in openshift_facts so that it appears as a ↵Andrew Butcher2017-01-251-1/+1
| | | | string everywhere it is used.
* Add new option 'openshift_docker_selinux_enabled'Russell Teague2017-01-241-1/+1
| | | | | Allows controlling 'selinux-enabled' docker options Can be set to true or false
* v1.3 Add RHAMPScott Dodson2017-01-171-8/+0
|