summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4898 from giuseppe/cri-oOpenShift Bot2017-08-0417-34/+444
|\ | | | | Merged by openshift-bot
| * cri-o: configure the CNI networkGiuseppe Scrivano2017-08-042-0/+15
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * cri-o: Restart cri-o after openshift sdn installationSteve Milner2017-08-031-0/+7
| |
| * cri-o: Continue node without SELinux checkSteve Milner2017-08-031-3/+3
| | | | | | | | | | cri-o currently requires SELinux to be off. This change disables the SELinux check in the openshift_node role when cri-o is in use.
| * examples: use the correct variable nameGiuseppe Scrivano2017-08-032-2/+2
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * cri-o: allow to override CRI-O image indipendently from DockerGiuseppe Scrivano2017-08-033-3/+5
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * 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>
| * openvswitch: system container depends on the cri-o serviceGiuseppe Scrivano2017-08-031-1/+12
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * cli_image: do not require Docker when using CRI-OGiuseppe Scrivano2017-08-032-25/+83
| | | | | | | | | | | | Use atomic to copy the CLI binaries to the host. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * cri-o: skip Set precise containerized version checkGiuseppe Scrivano2017-08-031-0/+9
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * cri-o: skip Docker version testGiuseppe Scrivano2017-08-031-0/+2
| | | | | | | | 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.
| * openshift_node: fix typo for experimental-criSteve Milner2017-08-031-1/+1
| |
| * cri-o: Fix node template to use full variableSteve Milner2017-08-031-1/+1
| |
| * 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>
| * openshift_docker_facts: Add use_crioSteve Milner2017-08-031-0/+1
| |
| * 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: Add cri-o as a Wants in node unitsSteve Milner2017-08-032-1/+2
| |
| * cri-o: configure storage and insecure registriesGiuseppe Scrivano2017-08-032-3/+34
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * node.yaml: configure node to use cri-o when openshift.common.use_crioGiuseppe Scrivano2017-08-031-0/+15
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * inventory: Add use_crio exampleSteve Milner2017-08-032-2/+10
| |
| * 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 #4673 from enoodle/allow_manageiq_to_read_logsScott Dodson2017-08-042-2/+8
|\ \ | | | | | | Adding pods/logs to manageiq role
| * | adding pods/logs to manageiq roleErez Freiberger2017-08-032-2/+8
| |/ | | | | | | | | | | | | This will allow manageiq to read the logs from elasticsearch in the logging project. Also, adding role to correct user and as clusterrole
* | Merge pull request #4978 from ewolinetz/bz1477440Scott Dodson2017-08-042-2/+2
|\ \ | | | | | | Fixing SA and clusterrole namespaces
| * | Fixing SA and clusterrole namespacesewolinetz2017-08-022-2/+2
| | |
* | | Merge pull request #4964 from abutcher/py3-expiryOpenShift Bot2017-08-042-35/+15
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Paren wrap integration print().Andrew Butcher2017-08-011-1/+1
| | | |
| * | | Update openshift_cert_expiry for py3 support.Andrew Butcher2017-08-011-34/+14
| | | |
* | | | Merge pull request #4996 from jkaurredhat/installer-1.7Scott Dodson2017-08-041-1/+1
|\ \ \ \ | | | | | | | | | | Quick Installer should specify which config file to edit.
| * | | | Quick Installer should specify which config file to edit.jkaurredhat2017-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bugzilla : https://bugzilla.redhat.com/show_bug.cgi?id=1460353 Signed-off-by: jkaurredhat <jkaur@redhat.com>
* | | | | Merge pull request #4992 from ilackarms/cfme-take2Scott Dodson2017-08-043-41/+50
|\ \ \ \ \ | | | | | | | | | | | | only provision nfs PVs if cloud_provider not defined
| * | | | | nfs only run if cloud_provider not definedScott Weiss2017-08-033-41/+50
| |/ / / /
* | | | | Merge pull request #5003 from sosiouxme/20170804-oc-clientScott Dodson2017-08-043-3/+33
|\ \ \ \ \ | | | | | | | | | | | | Origin image build: add oc client
| * | | | | Origin image build: add oc clientLuke Meyer2017-08-043-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oc client was left out with the move away from playbook2image. However it is needed in the image for the `oc cluster up` use case for installing logging or metrics. This change adds oc via the latest signed and released client RPM, which requires adding the centos-openshift-origin repo to the image.
* | | | | | Merge pull request #4925 from ↵OpenShift Bot2017-08-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/set-openshift_version-to-openshift_common_version_if_empty Merged by openshift-bot
| * | | | | | Set the openshift_version from the openshift.common.version in case it is emptyJan Chaloupka2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen the openshift_version is set to an empty string. Which results in openshift_pkg_version set to "-". Thus, failing installation of base and excluder packages. For more info see https://bugzilla.redhat.com/show_bug.cgi?id=1474871
* | | | | | | Merge pull request #4999 from jarrpa/null-file-fixScott Dodson2017-08-043-4/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | GlusterFS: Don't use /dev/null for empty file.
| * | | | | | GlusterFS: Don't use /dev/null for empty file.Jose A. Rivera2017-08-043-4/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1478198 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #5002 from sdodson/v37Scott Dodson2017-08-042-0/+248
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add v3.7 hosted templates
| * | | | | | Add v3.7 hosted templatesScott Dodson2017-08-042-0/+248
|/ / / / / /
* | | | | | Merge pull request #4789 from ↵Jan Chaloupka2017-08-043-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | ingvagabund/allow-to-specify-docker-registry-for-system-containers Allow to specify docker registry for system containers
| * | | | | allow to specify docker registry for system containersJan Chaloupka2017-07-193-8/+8
| | | | | |
* | | | | | Merge pull request #4988 from stevekuznetsov/skuznets/tolerate-3.7Scott Dodson2017-08-03177-11/+96054
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Update version checks to tolerate 3.7
| * | | | | Default gte_3_7 to falseScott Dodson2017-08-031-1/+1
| | | | | |