summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsDiego Castro2015-10-22120-619/+4713
|\
| * Merge pull request #736 from joelddiaz/cpu_no_pageJoel Diaz2015-10-221-1/+1
| |\
| | * Lower priority to stop the paging action.Joel Diaz2015-10-221-1/+1
| * | Merge pull request #728 from sdodson/fix-examplesBrenton Leanhardt2015-10-221-1/+1
| |\ \ | | |/ | |/|
| | * Fix openshift_examplesScott Dodson2015-10-221-1/+1
| * | Merge pull request #721 from abutcher/fix-routerBrenton Leanhardt2015-10-221-1/+1
| |\ \
| | * | Conditionally include openshift_router role.Andrew Butcher2015-10-221-1/+1
| * | | Merge pull request #723 from mfojtik/patch-1Brenton Leanhardt2015-10-221-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| | * | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| | |/
| * | Merge pull request #678 from sdodson/examplesWesley Hearn2015-10-222-5/+5
| |\ \
| | * | Add match online imagestream/template loading to enterpriseScott Dodson2015-10-201-3/+3
| | * | Adjust the logic as to when examples are deployedScott Dodson2015-10-202-5/+5
| * | | Remove pylint comment from Sha-Bang. SSH process get hung when calling python...Francisco Gimeno2015-10-211-1/+2
| | |/ | |/|
| * | Merge pull request #571 from dak1n1/routerWesley Hearn2015-10-214-9/+45
| |\ \
| | * | Support HA or single router, and start work on registryStefanie Forrester2015-10-214-9/+45
| * | | Merge pull request #715 from kwoodson/zabbKenny Woodson2015-10-213-0/+5
| |\ \ \
| | * | | Adding delta feature to zbx_itemKenny Woodson2015-10-203-0/+5
| * | | | Merge pull request #704 from sdodson/sdn-iptablesBrenton Leanhardt2015-10-211-0/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Open 4789/udp when using the SDNScott Dodson2015-10-191-0/+3
| * | | | Merge pull request #714 from kwoodson/zabbKenny Woodson2015-10-204-32/+38
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Zabbix server stat fixes. enable the proper item types.Kenny Woodson2015-10-204-32/+38
| * | | | Fix yaml indentation from use_openshift_sdn conditionalAndrew Butcher2015-10-201-2/+2
| * | | | Merge pull request #529 from sdodson/cockpit-masterWesley Hearn2015-10-203-0/+36
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add cockpit-ws with cockpit-kubernetes pluginScott Dodson2015-08-283-0/+36
| * | | | Merge pull request #589 from sdodson/issue585Brenton Leanhardt2015-10-201-2/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Lookup ansible_ssh_user group for kubeconfig permsScott Dodson2015-10-121-2/+6
| * | | | Allow disabling the network plugin configurationTomas Sedovic2015-10-202-0/+6
| | |_|/ | |/| |
| * | | Merge pull request #684 from gburges/gburges-projectcounterKenny Woodson2015-10-151-0/+10
| |\ \ \
| | * | | Update template_openshift_master.ymlGabor Burges2015-10-111-0/+10
| * | | | Merge pull request #680 from liggitt/master_caBrenton Leanhardt2015-10-131-0/+1
| |\ \ \ \
| | * | | | Add masterCA to oauth templateJordan Liggitt2015-10-091-0/+1
| | |/ / /
| * | | | Merge pull request #687 from mwoodson/zabbizMatt Woodson2015-10-121-2/+20
| |\ \ \ \
| | * | | | added the dynamic items to track free inodesMatt Woodson2015-10-121-2/+20
| | |/ / /
| * | | | Merge pull request #658 from menren/gce-supportThomas Wiest2015-10-123-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix : (node) labels defaults correctly to the variable openshift_node_labels ...Chengcheng Mu2015-10-091-1/+1
| | * | | Revert "Revert "GCE support""Chengcheng Mu2015-10-063-3/+3
| * | | | Raising limits to 90 and 85 for disk usageKenny Woodson2015-10-091-4/+4
| * | | | Merge pull request #635 from abutcher/bz1258243Brenton Leanhardt2015-10-092-4/+4
| |\ \ \ \
| | * | | | Use lower() filter for node hostnameAndrew Butcher2015-10-082-4/+4
| | |/ / /
| * | | | Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-082-24/+26
| |\ \ \ \
| | * | | | moved vswitch from master to nodeSten Turpin2015-10-082-24/+26
| * | | | | Merge pull request #676 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-1/+1
| |\| | | |
| | * | | | fixed not equals syntaxSten Turpin2015-10-081-1/+1
| * | | | | Merge pull request #675 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-0/+22
| |\| | | |
| | * | | | added items + triggers for ovs testsSten Turpin2015-10-081-0/+22
| * | | | | Merge pull request #674 from kwoodson/zabagentKenny Woodson2015-10-083-0/+34
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Adding zabbix agent templateKenny Woodson2015-10-083-0/+34
| * | | | | fixed spacingSten Turpin2015-10-081-5/+5
| * | | | | added running podsSten Turpin2015-10-081-0/+6