Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Diego Castro | 2015-10-22 | 120 | -619/+4713 |
|\ | |||||
| * | Merge pull request #736 from joelddiaz/cpu_no_page | Joel Diaz | 2015-10-22 | 1 | -1/+1 |
| |\ | | | | | | | Lower priority to stop the paging action. | ||||
| | * | Lower priority to stop the paging action. | Joel Diaz | 2015-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #728 from sdodson/fix-examples | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Fix openshift_examples | ||||
| | * | Fix openshift_examples | Scott Dodson | 2015-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #721 from abutcher/fix-router | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Conditionally include openshift_router role | ||||
| | * | | Conditionally include openshift_router role. | Andrew Butcher | 2015-10-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #723 from mfojtik/patch-1 | Brenton Leanhardt | 2015-10-22 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | Update examples-sync.sh | ||||
| | * | | Update examples-sync.sh | Michal Fojtik | 2015-10-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update examples-sync.sh | Michal Fojtik | 2015-10-22 | 1 | -1/+1 |
| | |/ | | | | | | | Fixes: https://github.com/openshift/openshift-ansible/issues/722 | ||||
| * | | Merge pull request #678 from sdodson/examples | Wesley Hearn | 2015-10-22 | 2 | -5/+5 |
| |\ \ | | | | | | | | | Adjust the logic as to when examples are deployed | ||||
| | * | | Add match online imagestream/template loading to enterprise | Scott Dodson | 2015-10-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | Adjust the logic as to when examples are deployed | Scott Dodson | 2015-10-20 | 2 | -5/+5 |
| | | | | |||||
| * | | | Remove pylint comment from Sha-Bang. SSH process get hung when calling ↵ | Francisco Gimeno | 2015-10-21 | 1 | -1/+2 |
| | |/ | |/| | | | | | | | python # pylint: disable=too-many-lines | ||||
| * | | Merge pull request #571 from dak1n1/router | Wesley Hearn | 2015-10-21 | 4 | -9/+45 |
| |\ \ | | | | | | | | | Support HA or single router. Deploy after service accounts are created | ||||
| | * | | Support HA or single router, and start work on registry | Stefanie Forrester | 2015-10-21 | 4 | -9/+45 |
| | | | | |||||
| * | | | Merge pull request #715 from kwoodson/zabb | Kenny Woodson | 2015-10-21 | 3 | -0/+5 |
| |\ \ \ | | | | | | | | | | | Adding delta to zbx_item | ||||
| | * | | | Adding delta feature to zbx_item | Kenny Woodson | 2015-10-20 | 3 | -0/+5 |
| | | | | | |||||
| * | | | | Merge pull request #704 from sdodson/sdn-iptables | Brenton Leanhardt | 2015-10-21 | 1 | -0/+3 |
| |\ \ \ \ | | |_|/ / | |/| | | | Add UDP 4789 firewall rule when using the SDN | ||||
| | * | | | Open 4789/udp when using the SDN | Scott Dodson | 2015-10-19 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge pull request #714 from kwoodson/zabb | Kenny Woodson | 2015-10-20 | 4 | -32/+38 |
| |\ \ \ \ | | | |/ / | | |/| | | Adding zabbix agent bits zabbix-server | ||||
| | * | | | Zabbix server stat fixes. enable the proper item types. | Kenny Woodson | 2015-10-20 | 4 | -32/+38 |
| | | | | | |||||
| * | | | | Fix yaml indentation from use_openshift_sdn conditional | Andrew Butcher | 2015-10-20 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #529 from sdodson/cockpit-master | Wesley Hearn | 2015-10-20 | 3 | -0/+36 |
| |\ \ \ \ | | |/ / / | |/| | | | Add cockpit role | ||||
| | * | | | Add cockpit-ws with cockpit-kubernetes plugin | Scott Dodson | 2015-08-28 | 3 | -0/+36 |
| | | | | | |||||
| * | | | | Merge pull request #589 from sdodson/issue585 | Brenton Leanhardt | 2015-10-20 | 1 | -2/+6 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Lookup ansible_ssh_user group for kubeconfig perms | ||||
| | * | | | Lookup ansible_ssh_user group for kubeconfig perms | Scott Dodson | 2015-10-12 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | Fixes #585 | ||||
| * | | | | Allow disabling the network plugin configuration | Tomas Sedovic | 2015-10-20 | 2 | -0/+6 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | This is useful when we want to use a different networking solution without having any networking plugin code run when the services start up. | ||||
| * | | | Merge pull request #684 from gburges/gburges-projectcounter | Kenny Woodson | 2015-10-15 | 1 | -0/+10 |
| |\ \ \ | | | | | | | | | | | Update template_openshift_master.yml | ||||
| | * | | | Update template_openshift_master.yml | Gabor Burges | 2015-10-11 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Merge pull request #680 from liggitt/master_ca | Brenton Leanhardt | 2015-10-13 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Add masterCA to oauth template | ||||
| | * | | | | Add masterCA to oauth template | Jordan Liggitt | 2015-10-09 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #687 from mwoodson/zabbiz | Matt Woodson | 2015-10-12 | 1 | -2/+20 |
| |\ \ \ \ | | | | | | | | | | | | | added the dynamic items to track free inodes | ||||
| | * | | | | added the dynamic items to track free inodes | Matt Woodson | 2015-10-12 | 1 | -2/+20 |
| | |/ / / | |||||
| * | | | | Merge pull request #658 from menren/gce-support | Thomas Wiest | 2015-10-12 | 3 | -3/+3 |
| |\ \ \ \ | | |/ / / | |/| | | | GCE-support | ||||
| | * | | | fix : (node) labels defaults correctly to the variable openshift_node_labels ↵ | Chengcheng Mu | 2015-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | when oo_option returns an empty list | ||||
| | * | | | Revert "Revert "GCE support"" | Chengcheng Mu | 2015-10-06 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b. | ||||
| * | | | | Raising limits to 90 and 85 for disk usage | Kenny Woodson | 2015-10-09 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge pull request #635 from abutcher/bz1258243 | Brenton Leanhardt | 2015-10-09 | 2 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | | | Bug 1258243: Use lower() filter for node hostname | ||||
| | * | | | | Use lower() filter for node hostname | Andrew Butcher | 2015-10-08 | 2 | -4/+4 |
| | |/ / / | |||||
| * | | | | Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitor | Sten Turpin | 2015-10-08 | 2 | -24/+26 |
| |\ \ \ \ | | | | | | | | | | | | | moved vswitch from master to node | ||||
| | * | | | | moved vswitch from master to node | Sten Turpin | 2015-10-08 | 2 | -24/+26 |
| | | | | | | |||||
| * | | | | | Merge pull request #676 from stenwt/sturpin-2015-10-08-ovs-monitor | Sten Turpin | 2015-10-08 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | fixed not equals syntax | ||||
| | * | | | | fixed not equals syntax | Sten Turpin | 2015-10-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #675 from stenwt/sturpin-2015-10-08-ovs-monitor | Sten Turpin | 2015-10-08 | 1 | -0/+22 |
| |\| | | | | | | | | | | | | | | | | added items + triggers for ovs tests | ||||
| | * | | | | added items + triggers for ovs tests | Sten Turpin | 2015-10-08 | 1 | -0/+22 |
| | | | | | | |||||
| * | | | | | Merge pull request #674 from kwoodson/zabagent | Kenny Woodson | 2015-10-08 | 3 | -0/+34 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Adding zabbix agent template to config management | ||||
| | * | | | | Adding zabbix agent template | Kenny Woodson | 2015-10-08 | 3 | -0/+34 |
| | | | | | | |||||
| * | | | | | fixed spacing | Sten Turpin | 2015-10-08 | 1 | -5/+5 |
| | | | | | | |||||
| * | | | | | added running pods | Sten Turpin | 2015-10-08 | 1 | -0/+6 |
| | | | | | |