summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #680 from liggitt/master_caBrenton Leanhardt2015-10-131-0/+1
|\ | | | | Add masterCA to oauth template
| * 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 inodes
| * | added the dynamic items to track free inodesMatt Woodson2015-10-121-2/+20
| |/
* | Merge pull request #658 from menren/gce-supportThomas Wiest2015-10-1215-75/+181
|\ \ | |/ |/| GCE-support
| * Adding second param. true to many default filtersChengcheng Mu2015-10-094-7/+7
| |
| * fix : (node) labels defaults correctly to the variable openshift_node_labels ↵Chengcheng Mu2015-10-091-1/+1
| | | | | | | | when oo_option returns an empty list
| * Merge branch 'gce-support' of https://github.com/menren/openshift-ansible ↵Chengcheng Mu2015-10-061-30/+5
| |\ | | | | | | | | | into gce-support
| | * playbooks/openstack/openshift-cluster/launch.yml back to its correct versionChengcheng Mu2015-10-061-30/+5
| | |
| * | Revert "Revert "GCE support""Chengcheng Mu2015-10-0616-80/+211
| | | | | | | | | | | | This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b.
* | | Merge pull request #679 from kwoodson/fslimitsKenny Woodson2015-10-091-4/+4
|\ \ \ | | | | | | | | Raising the fs check limits to 10 and 15% from 5 and 10.
| * | | 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
|\ \ \ | | | | | | | | Bug 1258243: Use lower() filter for node hostname
| * | | 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 node
| * | | 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 syntax
| * | | 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 tests
| * | | 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 template to config management
| * | | Adding zabbix agent templateKenny Woodson2015-10-083-0/+34
| | | |
* | | | Merge pull request #655 from stenwt/sturpin-2015-10-01-running-podsSten Turpin2015-10-081-0/+6
|\ \ \ \ | | | | | | | | | | Sturpin 2015 10 01 running pods
| * | | | fixed spacingSten Turpin2015-10-081-5/+5
| | | | |
| * | | | added running podsSten Turpin2015-10-081-0/+6
|/ / / /
* | | | Merge pull request #672 from kwoodson/zbxmediafixKenny Woodson2015-10-081-0/+3
|\ \ \ \ | | | | | | | | | | Fixed a bug where we are updating where we should be creating.
| * | | | Fixed user media bug where we would update media when we really wanted to ↵Kenny Woodson2015-10-081-0/+3
| | | | | | | | | | | | | | | | | | | | create.
* | | | | removed static xvda checksMatt Woodson2015-10-081-32/+0
| |/ / / |/| | |
* | | | Merge pull request #633 from robotmaxtron/mwhittin-cluster-user-countThomas Wiest2015-10-081-0/+12
|\ \ \ \ | | | | | | | | | | Zabbix check and trigger for user count
| * | | | Changed trigger to only info alert if users is at 0Max Whittingham2015-10-051-1/+1
| | | | |
| * | | | Zabbix check and trigger for user countMax Whittingham2015-09-301-0/+12
| | | | |
* | | | | Merge pull request #669 from kwoodson/protofixMatt Woodson2015-10-071-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed a bug where applicationids were not being queried properly.
| * | | | Fixed a bug where applicationids were not being filtered properlyKenny Woodson2015-10-071-3/+3
|/ / / /
* | | | Merge pull request #668 from kwoodson/quick2Kenny Woodson2015-10-073-0/+441
|\ \ \ \ | | | | | | | | | | Adding zabbix template to config management
| * | | | Zabbix server template addedKenny Woodson2015-10-073-0/+441
|/ / / /
* | | | Merge pull request #660 from sdodson/updated-registry-factsBrenton Leanhardt2015-10-071-4/+4
|\ \ \ \ | | | | | | | | | | Updated registry fact with latest deployment_type mappings
| * | | | Updated registry fact with latest deployment_type mappingsScott Dodson2015-10-061-4/+4
| | | | |
* | | | | Merge pull request #638 from jaryn/patch-2Brenton Leanhardt2015-10-071-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix newline
| * | | | | Fix newlineJaroslav Henner2015-09-301-1/+2
| | | | | |
* | | | | | Merge pull request #667 from kwoodson/loopbackKenny Woodson2015-10-071-7/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed last play in playbook as it will fail
| * | | | | | Removing the last step as it will fail.Kenny Woodson2015-10-071-7/+0
| | | | | | |
* | | | | | | Merge pull request #666 from kwoodson/loopbackMatt Woodson2015-10-071-3/+1
|\| | | | | | | |_|_|_|/ / |/| | | | | Removed io1 and added gp2
| * | | | | Removed io1 type for gp2Kenny Woodson2015-10-071-3/+1
| | | | | |
* | | | | | Merge pull request #657 from liggitt/schedulerBrenton Leanhardt2015-10-061-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add kind/apiVersion to scheduler.json template
| * | | | | Add kind/apiVersion to scheduler.json templateJordan Liggitt2015-10-051-0/+2
| | | | | |
* | | | | | Merge pull request #653 from arsogukpinar/masterBrenton Leanhardt2015-10-061-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix for name conflict
| * | | | | Fix for name conflictAli Sogukpinar2015-10-051-2/+2
| | | | | | | | | | | | | | | | | | Template name is conflicting with the template name from 'eap6-basic-sti.json' .
* | | | | | Merge pull request #654 from openshift/revert-641-gce-supportThomas Wiest2015-10-0516-211/+80
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Revert "GCE support" because it breaks openstack.
| * | | | | Revert "GCE support"Thomas Wiest2015-10-0516-211/+80
|/ / / / /
* | | | | Merge pull request #641 from menren/gce-supportThomas Wiest2015-10-0516-80/+211
|\ \ \ \ \ | | |_|_|/ | |/| | | GCE support
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 01:05:16 +0000