summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5888 from jcantrill/1501599_allow_project_overcommitOpenShift Merge Robot2017-10-301-0/+8
|\ | | | | | | | | | | | | | | Automatic merge from submit-queue. bug 1501599. Omit logging project from overcommit restrictions This PR: * Annotates the logging project to remove overcommit restrictions
| * bug 1501599. Omit logging project from overcommit restrictionsJeff Cantrill2017-10-251-0/+8
| |
* | Merge pull request #5917 from ashcrow/kennys-patchScott Dodson2017-10-303-5/+8
|\ \ | | | | | | docker: Create openshift_docker_is_node_or_master variable
| * | docker: Create openshift_docker_is_node_or_master variableSteve Milner2017-10-273-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used in place of: inventory_hostname in groups['oo_masters_to_config'] or \ inventory_hostname in groups['oo_nodes_to_config'] While the previous version works, this change helps with the tasks are run during AMI creation. Code written by Kenny Woodson @kwoodson.
* | | Merge pull request #5867 from chinacoolhacker/masterOpenShift Merge Robot2017-10-3010-0/+547
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS suppot for OpenShift v1.5 Added files and templates for OpenShift v1.5
| * | | Glusterfs storage templates for v1.5 addedchinacoolhacker2017-10-2510-0/+547
| | | |
* | | | Merge pull request #5769 from jarrpa/image-revertOpenShift Merge Robot2017-10-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: Remove image option from heketi command Reverts #5562, option has been removed from heketi command Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1502054 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | GlusterFS: Remove image option from heketi commandJose A. Rivera2017-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts #5562, option has been removed from heketi command Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | Merge pull request #5864 from JacobTanenbaum/new-CIDROpenShift Merge Robot2017-10-301-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. add new clusterNetworks fields to new installs add clusterNetworks field to the networkConfig so that the new fields appear in new installs
| * | | | | add new clusterNetworks fields to new installsJacob Tanenbaum2017-10-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add clusterNetworks field to the networkConfig so that the new fields appear in new installs when openshift version is greater then 3.7
* | | | | | Merge pull request #5720 from sdodson/issue5108Scott Dodson2017-10-303-0/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add dm_thin_pool for gluster use
| * | | | | | Add dm_thin_pool for gluster useScott Dodson2017-10-303-0/+26
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.187.0].Jenkins CD Merge Bot2017-10-302-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.186.0].Jenkins CD Merge Bot2017-10-292-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.185.0].Jenkins CD Merge Bot2017-10-282-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5899 from staebler/update_service_catalog_binary_nameOpenShift Merge Robot2017-10-272-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update the name of the service-catalog binary Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506541.
| * | | | | | | Update the name of the service-catalog binarystaebler2017-10-262-2/+4
| | | | | | | |
* | | | | | | | Merge pull request #5816 from sosiouxme/20171019-disk-check-sum-varOpenShift Merge Robot2017-10-272-3/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. disk_availability check: include submount storage Fixes bug [1491566](https://bugzilla.redhat.com/show_bug.cgi?id=1491566) In order to determine how much storage is under a path, include any mounts that are below it in addition to the path itself.
| * | | | | | | | disk_availability check: include submount storageLuke Meyer2017-10-202-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1491566 https://bugzilla.redhat.com/show_bug.cgi?id=1491566 In order to determine how much storage is under a path, include any mounts that are below it in addition to the path itself.
* | | | | | | | | Merge pull request #5897 from jcantrill/1506073_cpu_request_match_limitOpenShift Merge Robot2017-10-278-7/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. bug 1506073. Lower cpu request for logging when it exceeds limit This PR fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506073 by: * Lowering the CPU request to match the limit when the request is greater then a specified limit I have an open question on if this is an acceptable change of if it makes the outcome unexpected. Should we prefer to exit during the deployment and advise the operator to correct their inventory?
| * | | | | | | | | bug 1506073. Lower cpu request for logging when it exceeds limitJeff Cantrill2017-10-278-7/+50
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.184.0].Jenkins CD Merge Bot2017-10-272-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #3806 from jcantrill/upgrade_logging_invalidOpenShift Merge Robot2017-10-271-79/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Upgrade logging invalid
| * | | | | | | | | bug 1435144. Remove uneeded upgrade in openshift_logging roleJeff Cantrill2017-10-271-79/+0
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5887 from kwoodson/rename_csrKenny Woodson2017-10-272-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Renaming csr to bootstrap for consistency.
| * | | | | | | | | | Renaming csr to bootstrap for consistency.Kenny Woodson2017-10-252-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5916 from mrunalp/crio_log_size_maxScott Dodson2017-10-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | cri-o: Set max log size to 50 mb
| * | | | | | | | | 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 #5911 from giuseppe/crio-open-port-10010Scott Dodson2017-10-274-0/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | cri-o: open port 10010
| * | | | | | | | | cri-o: open port 10010Giuseppe Scrivano2017-10-274-0/+53
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | Merge pull request #5901 from ashcrow/failed-whenScott Dodson2017-10-271-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | crio: Add failed_when to overlay check
| * | | | | | | | | crio: Add failed_when to overlay checkSteve Milner2017-10-261-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506399 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | | | | Merge pull request #5904 from mtnbikenc/fix-openshift_releaseRussell Teague2017-10-271-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Correct openshift_release regular expression
| * | | | | | | | | Correct openshift_release regular expressionRussell Teague2017-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match only versions like: 3.7 3.7.0 3.7.0.0 Avoids matches like: 3.7.0.0.0.0
* | | | | | | | | | Merge pull request #5905 from ashcrow/restorcon-for-crioScott Dodson2017-10-271-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | crio: restorcon /var/lib/containers
| * | | | | | | | | | crio: restorcon /var/lib/containersSteve Milner2017-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the cri-o system container some items in /var/lib/containers end up having incorrect labels. This runs restorecon -R /var/lib/containers after the system container is installed.
* | | | | | | | | | | Merge pull request #5823 from mtnbikenc/fix-initialize_factsScott Dodson2017-10-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Force include_role to static for loading openshift_facts module
| * | | | | | | | | | | Force include_role to static for loading openshift_facts moduleRussell Teague2017-10-191-0/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5880 from giuseppe/fix-docker-crio-credentialsScott Dodson2017-10-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docker: set credentials when using system container
| * | | | | | | | | | | docker: set credentials when using system containerGiuseppe Scrivano2017-10-263-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | | Merge pull request #5742 from mtnbikenc/refactor-checksScott Dodson2017-10-277-34/+65
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | 1504593 Refactor health check playbooks
| * | | | | | | | | | | | Refactor health check playbooksRussell Teague2017-10-127-34/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Standardize play/tasks naming - Move install checks to separate playbook with checkpointing - Correct 'docker_storage' tags
* | | | | | | | | | | | | Merge pull request #5874 from mtnbikenc/fix-5675Scott Dodson2017-10-271-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | Remove 'Not Started' status from playbook checkpoint
| * | | | | | | | | | | | Remove 'Not Started' status from playbook checkpointRussell Teague2017-10-251-5/+0
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playbook status should only be reported for phases that have completed or which have been started. Reporting 'Not Started' could be confusing when running playbooks that do not have an 'installer phase'. Fixes #5675
* | | | | | | | | | | | Merge pull request #5890 from staebler/svc-cat-rc0.1.0Scott Dodson2017-10-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CA Bundle passed to service-catalog broker for ansible-service-broker
| * | | | | | | | | | | | Fix CA Bundle passed to service-catalog broker for ansible-service-brokerstaebler2017-10-251-1/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5760 from sdodson/oa-deps-masterScott Dodson2017-10-271-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Make openshift-ansible depend on all subpackages
| * | | | | | | | | | | | Make openshift-ansible depend on all subpackagesScott Dodson2017-10-131-1/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5910 from mtnbikenc/remove-origin-inventoryScott Dodson2017-10-271-900/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inadvertently committed inventory file
| * | | | | | | | | | | | | Remove inadvertently committed inventory fileRussell Teague2017-10-271-900/+0
| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:13:47 +0000