summaryrefslogtreecommitdiff
path: root/roles/docker
AgeCommit message (Collapse)Author
2017-10-03Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-oseOpenShift Merge Robot
Automatic merge from submit-queue. CRI-O, Docker: set the tag to the OpenShift release on RHEL Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
2017-10-02Restore registires to /etc/sysconfig/dockerMichael Gugino
Previously, a commit was added to migrate registires from /etc/sysconfig/docker to /etc/containers/registries.conf We are not currently enforcing a minimum version of docker to consume from this new file, thus some installations are not utilizing the correct repositories. This commit duplicates the registires in both locations to ensure additional/blocked/insecure registries are honored.
2017-09-29Fix typo in files (Docker registries)William Burton
2017-09-27Migrate enterprise registry logic to docker roleMichael Gugino
Currently, the enterprise registry to forcefully added in openshift_facts. Recently, the docker role has been modified to consume registry variables directly, bypassing openshift_facts. This commit cleans up unused code in openshift_facts, and migrates enterprise registry logic to the docker role. Fixes: https://github.com/openshift/openshift-ansible/issues/5557
2017-09-27docker: fix some tox warningsGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-27Require openshift_image_tag in the inventory with openshift-enterpriseGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-27crio: use the image_tag on RHELGiuseppe Scrivano
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-27docker: use the image_tag on RHELGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-26Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot
Automatic merge from submit-queue Detect the proper version of the images when using CRI-O Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494357
2017-09-25Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot
Automatic merge from submit-queue Move additional/block/insecure registires to /etc/containers/... Move additional/block/insecure registires to /etc/containers/registries.conf 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
2017-09-25crio: set the correct image name with OSEGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-24Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lbOpenShift Merge Robot
Automatic merge from submit-queue crio: skip installation on lbs and nfs nodes Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494461 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-22Merge pull request #5354 from ashcrow/crio-systemcontainer-image-overrideOpenShift Merge Robot
Automatic merge from submit-queue cri-o: Allow full image override ``openshift_crio_systemcontainer_image_registry_override`` has been replaced with ``openshift_crio_systemcontainer_image_override``. The difference is ``openshift_crio_systemcontainer_image_override`` takes a full image path including the tag. Example: ``` openshift_crio_systemcontainer_image_override=gscrivano/cri-o-centos:latest ```
2017-09-22crio: skip installation on lbs and nfs nodesGiuseppe Scrivano
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494461 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-21Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino
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
2017-09-21Merge pull request #5477 from mgugino-upstream-stage/hot-fix-oreg_urlOpenShift Merge Robot
Automatic merge from submit-queue Remove default value for oreg_url Due to some plays importing variables from roles directly, oreg_url was being set to a default value when it otherwise shouldn't be. This commit removes the default values for oreg_url to ensure existing logic works as desired. Fixes: https://github.com/openshift/openshift-ansible/issues/5455
2017-09-20Remove default value for oreg_urlMichael Gugino
Due to some plays importing variables from roles directly, oreg_url was being set to a default value when it otherwise shouldn't be. This commit removes the default values for oreg_url to ensure existing logic works as desired. Fixes: https://github.com/openshift/openshift-ansible/issues/5455
2017-09-20crio: ensure no default CNI configuration files are leftGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-19more retries on repoquery_cmdLuke Meyer
2017-09-14Merge pull request #5401 from sosiouxme/20170913-retries-subsetLuke Meyer
add retries on repoquery
2017-09-13Merge pull request #5359 from mgugino-upstream-stage/version-docker-auth-configOpenShift Bot
Merged by openshift-bot
2017-09-13cri-o: Fix Fedora image nameSteve Milner
Signed-off-by: Steve Milner <smilner@redhat.com>
2017-09-13add retry on repoquery_cmdLuke Meyer
2017-09-12cri-o: Allow full image overrideSteve Milner
openshift_crio_systemcontainer_image_registry_override has been replaced with openshift_crio_systemcontainer_image_override. The difference is openshift_crio_systemcontainer_image_override takes a full image path including the tag. Example: openshift_crio_systemcontainer_image_override=gscrivano/cri-o-centos:latest
2017-09-11Fix: authenticated registry support for containerized hostsMichael Gugino
Currently, openshift-anisble supports authentication to container registries to pull down openshift container images. The openshift_verison role uses the docker cli to gather image information from container registries before authentication credentials are provided by openshift-ansible. This commit creates the necessary token to authenticate to private registries during openshift_version. The token is generated by the role 'docker' on all hosts where docker is installed/configured when oreg_auth_users is defined. This commit also adds a read-only mount into the openshift master and node container services. This mount is '/var/lib/origin/.docker:/root/.docker:ro'. This is because the container images do not currently read the values in '/var/lib/origin/.docker' as this may be a bug upstream. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
2017-09-11container-engine: Allow full image overrideSteve Milner
openshift_docker_systemcontainer_image_registry_override has been replaced with openshift_docker_systemcontainer_image_override. The difference is openshift_docker_systemcontainer_image_override takes a full image path including the tag. Example: openshift_docker_systemcontainer_image_override=gscrivano/container-engine:latest Signed-off-by: Steve Milner <smilner@redhat.com>
2017-09-07Merge pull request #5310 from ashcrow/split-rhel-centos-crioOpenShift Bot
Merged by openshift-bot
2017-09-06Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot
Merged by openshift-bot
2017-09-06cri-o: Split RHEL and CentOS imagesSteve Milner
2017-08-25roles: use openshift_use_crioGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-25cri-o: change to system runcGiuseppe Scrivano
Newer versions of cri-o do not carry runc but use the one from the system. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-24cri-o: add support for additional registriesGiuseppe Scrivano
Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-08First attempt at refactor of os_firewallKenny Woodson
2017-08-04cri-o: configure the CNI networkGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-03cri-o: allow to override CRI-O image indipendently from DockerGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-03docker: introduce use_crio_onlyGiuseppe Scrivano
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>
2017-08-03docker: skip Docker setup when using CRI-OGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-03cri-o: use only images from Docker HubGiuseppe Scrivano
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>
2017-08-03cri-o: Enable systemd-modules-load if requiredSteve Milner
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.
2017-08-03cri-o: Ensure overlay is availableSteve Milner
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.
2017-08-03cri-o: Default insecure registries to ""Steve Milner
2017-08-03crio: use a template for the configurationGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-03cri-o: Minor fixes for tasksSteve Milner
2017-08-03cri-o: Hardcode image name to cri-oSteve Milner
2017-08-03cri-o: configure storage and insecure registriesGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-08-03cri-o: Allow cri-o usage.Steve Milner
This change reuses the docker role to inject cri-o usage.
2017-07-20Merge pull request #4757 from sosiouxme/20170703-docker-storage-overlay2Scott Dodson
openshift_checks/docker_storage: overlay/2 support
2017-07-18Ensure proper fact evaluationScott Dodson
2017-07-18Wrap additional service changes in retriesScott Dodson
2017-07-18Test docker restart with retries 3 delay 30Steve Milner