Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #475 from wshearn/fix_label | Wesley Hearn | 2015-08-14 | 1 | -1/+1 |
|\ | | | | | Skip node label if labels are empty | ||||
| * | Skip node label if labels are empty | Wesley Hearn | 2015-08-14 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #466 from sdodson/require-etcd-2 | Brenton Leanhardt | 2015-08-14 | 1 | -1/+1 |
|\ | | | | | Require etcd-2.* | ||||
| * | Require etcd 2.* | Scott Dodson | 2015-08-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Fixes #422 When etcd-2.1 is available in RHEL7 / Centos 7 we'll bumpt to that as it's considerably more stable with regard to WAL corruption and recovery. | ||||
* | | Merge pull request #473 from lhuard1A/fix_pylint | Wesley Hearn | 2015-08-14 | 1 | -2/+2 |
|\ \ | | | | | | | Fix pylint errors on oo_filters.py | ||||
| * | | Fix pylint errors on oo_filters.py | Lénaïc Huard | 2015-08-14 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #467 from detiber/fixNodeLabeling | Wesley Hearn | 2015-08-14 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | Fix for node labeling where internal node name != inventory_hostname | ||||
| * | | | Fix for node labeling where internal node name != inventory_hostname | Jason DeTiberus | 2015-08-13 | 2 | -5/+5 |
| | |/ | |/| | |||||
* | | | Merge pull request #407 from aveshagarwal/ae-ansible-merge-auth | Brenton Leanhardt | 2015-08-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Enable htpasswd by default in the example hosts file. | ||||
| * | | | Enable htpasswd by default in the example hosts file. | Avesh Agarwal | 2015-08-13 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #464 from dak1n1/fix_pause | Stefanie Forrester | 2015-08-13 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | pause for a minimum of 15 seconds | ||||
| * | | make sure that number is an int | Stefanie Forrester | 2015-08-13 | 1 | -1/+1 |
| | | | |||||
| * | | pause for a minimum of 15 seconds | Stefanie Forrester | 2015-08-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #450 from detiber/addDefaultNodeSelector | Thomas Wiest | 2015-08-13 | 3 | -1/+5 |
|\ \ | |/ |/| | Add support for setting default node selector | ||||
| * | Add support for setting default node selector | Jason DeTiberus | 2015-08-12 | 3 | -1/+5 |
| | | |||||
* | | Merge pull request #416 from spinolacastro/fix_labels | Wesley Hearn | 2015-08-12 | 4 | -1/+32 |
|\ \ | |/ |/| | Fix node labeling. Issue #305 | ||||
| * | Notes for schedule behavior. | Diego Castro (dscastro) | 2015-08-12 | 1 | -0/+12 |
| | | |||||
| * | Don't try to label node if there's no labels | Diego Castro | 2015-08-10 | 1 | -0/+2 |
| | | |||||
| * | Fix node labels | Diego Castro | 2015-08-10 | 2 | -7/+3 |
| | | |||||
| * | Applying changes suggested by @sdodson | Diego Castro (dscastro) | 2015-08-04 | 1 | -3/+3 |
| | | |||||
| * | Fix node labeling. Issue #305 | Diego Castro | 2015-08-04 | 3 | -1/+22 |
| | | |||||
* | | Merge pull request #429 from spinolacastro/custom_cors | Brenton Leanhardt | 2015-08-12 | 3 | -1/+7 |
|\ \ | | | | | | | Custom cors configuration | ||||
| * | | Fix Custom Cors | Diego Castro | 2015-08-12 | 3 | -1/+7 |
| |/ | |||||
* | | Merge pull request #454 from kwoodson/cleanup | Kenny Woodson | 2015-08-12 | 5 | -84/+2 |
|\ \ | | | | | | | zbx_item fix and removed files | ||||
| * | | zbx item now uses key as default name. Clean up. | Kenny Woodson | 2015-08-12 | 5 | -84/+2 |
|/ / | |||||
* | | Merge pull request #451 from kwoodson/completion | Kenny Woodson | 2015-08-12 | 4 | -8/+29 |
|\ \ | | | | | | | bash completion fix. | ||||
| * | | Updated to read config first and default to users home dir | Kenny Woodson | 2015-08-12 | 4 | -8/+29 |
|/ / | |||||
* | | Merge pull request #440 from lhuard1A/infra_node_support_openstack | Thomas Wiest | 2015-08-12 | 3 | -11/+105 |
|\ \ | | | | | | | Infra node support for OpenStack | ||||
| * | | Infra node support for OpenStack | Lénaïc Huard | 2015-08-12 | 3 | -11/+105 |
| | | | |||||
* | | | Merge pull request #381 from pat2man/aws-fixes | Thomas Wiest | 2015-08-12 | 2 | -3/+42 |
|\ \ \ | | | | | | | | | Switch to Centos and enable SDN on origin. | ||||
| * | | | Switch to Centos and enable SDN on origin. | Patrick Tescher | 2015-07-22 | 2 | -3/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fedora 21 doesn’t seem to have docker 1.6.2. Centos does. Also without SDN networking was not working on AWS. | ||||
* | | | | Merge pull request #441 from lhuard1A/ansible_host_key_checking_false | Thomas Wiest | 2015-08-12 | 1 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | Prevent Ansible from serializing tasks | ||||
| * | | | | Prevent Ansible from serializing tasks | Lénaïc Huard | 2015-08-11 | 1 | -0/+10 |
| | |/ / | |/| | | | | | | | | | | even if the ssh known_host file misses the ssh public host keys of the servers. | ||||
* | | | | Merge pull request #446 from kwoodson/idem | Kenny Woodson | 2015-08-11 | 17 | -676/+1406 |
|\ \ \ \ | | | | | | | | | | | Zabbix Idempotent module | ||||
| * | | | | Zabbix Idempotency | Kenny Woodson | 2015-08-11 | 17 | -676/+1406 |
| | | | | | |||||
* | | | | | Merge pull request #445 from mwoodson/remove_monitor | Matt Woodson | 2015-08-11 | 3 | -133/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | removed deploy monitoring containders | ||||
| * | | | | removed deploy monitoring containders | Matt Woodson | 2015-08-11 | 3 | -133/+0 |
|/ / / / | |||||
* | | | | Merge pull request #442 from lhuard1A/infra_node_support_libvirt | Wesley Hearn | 2015-08-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix infra node support on libvirt | ||||
| * | | | Fix infra node support on libvirt | Lénaïc Huard | 2015-08-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #439 from wshearn/online_use_offical_registry | Wesley Hearn | 2015-08-10 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | Use the official redhat registry for online | ||||
| * | | | Use the official redhat registry for online | Wesley Hearn | 2015-08-10 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge pull request #435 from dak1n1/numnode_pause | Stefanie Forrester | 2015-08-07 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | take number of nodes into account when pausing | ||||
| * | | | take number of nodes into account when pausing | Stefanie Forrester | 2015-08-07 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #431 from dak1n1/tdagent_pause | Stefanie Forrester | 2015-08-06 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | added pause before td-agent restart | ||||
| * | | | added pause before td-agent restart | Stefanie Forrester | 2015-08-06 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #432 from kwoodson/example | Kenny Woodson | 2015-08-06 | 1 | -0/+8 |
|\ \ \ \ | |/ / / |/| | | | Added example | ||||
| * | | | example added | Kenny Woodson | 2015-08-06 | 1 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #430 from sdodson/revert-423-namespace-inventory | Brenton Leanhardt | 2015-08-06 | 5 | -18/+18 |
|\ \ \ | | | | | | | | | Revert "namespace the byo inventory so the group names aren't so gene… | ||||
| * | | | Revert "namespace the byo inventory so the group names aren't so generic" | Scott Dodson | 2015-08-06 | 5 | -18/+18 |
|/ / / | |||||
* | | | Merge pull request #427 from sdodson/500ms-heartbeat | Brenton Leanhardt | 2015-08-05 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Reduce heartbeat frequency to 500ms to reduce etcd cpu load |