Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #611 from wshearn/fix_product_type | Wesley Hearn | 2015-09-30 | 1 | -1/+1 |
|\ | | | | | Add missing , | ||||
| * | Add missing , | Wesley Hearn | 2015-09-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #582 from sdodson/upgrades | Brenton Leanhardt | 2015-09-30 | 13 | -8/+153 |
|\ \ | | | | | | | Upgrade playbook | ||||
| * | | Upgrades | Scott Dodson | 2015-09-23 | 13 | -8/+153 |
| | | | |||||
* | | | Merge pull request #634 from abutcher/whats-next | Brenton Leanhardt | 2015-09-30 | 3 | -46/+11 |
|\ \ \ | | | | | | | | | Point to advanced installation guide for post install steps | ||||
| * | | | Point to advanced installation guide in READMEs | Andrew Butcher | 2015-09-30 | 3 | -46/+11 |
|/ / / | |||||
* | | | Merge pull request #630 from mwoodson/grow_docker_vg | Matt Woodson | 2015-09-29 | 1 | -2/+1 |
|\ \ \ | | | | | | | | | added pylint as a package to ansible-tower | ||||
| * | | | added pylint as a package to ansible-tower | Matt Woodson | 2015-09-29 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #629 from mwoodson/grow_docker_vg | Matt Woodson | 2015-09-29 | 1 | -0/+2 |
|\| | | | | | | | | | | | don't want file ext in prod | ||||
| * | | | added comment to the grow_docker_vg playbook | Matt Woodson | 2015-09-29 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #628 from mwoodson/grow_docker_vg | Matt Woodson | 2015-09-29 | 2 | -0/+245 |
|\| | | | | | | | | | | | added the grow_docker_vg adhoc playbook | ||||
| * | | | added the grow_docker_vg adhoc playbook | Matt Woodson | 2015-09-29 | 2 | -0/+245 |
|/ / / | |||||
* | | | Merge pull request #626 from kwoodson/quick | Matt Woodson | 2015-09-28 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Error handling added | ||||
| * | | | Added some debug when zbxapi has an issue | Kenny Woodson | 2015-09-28 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #625 from kwoodson/triggerproto | Kenny Woodson | 2015-09-28 | 4 | -1/+216 |
|\ \ \ | | | | | | | | | Adding trigger prototype support | ||||
| * | | | Trigger prototype support | Kenny Woodson | 2015-09-28 | 4 | -1/+216 |
| | | | | |||||
* | | | | Merge pull request #624 from abutcher/merge-facts | Brenton Leanhardt | 2015-09-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Avoid attribute error in merge facts | ||||
| * | | | | Only continue to merge facts if both old and new values are type dict. | Andrew Butcher | 2015-09-28 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #613 from jaryn/patch-1 | Brenton Leanhardt | 2015-09-28 | 1 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | Fix bullets in libvirt readme | ||||
| * | | | Fix bullets in libvirt readme | Jaroslav Henner | 2015-09-25 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #616 from kwoodson/tmp3 | Kenny Woodson | 2015-09-25 | 1 | -9/+44 |
|\ \ \ \ | | | | | | | | | | | Required updates to zabbix user media | ||||
| * | | | | Updates to zbx_user_media | Kenny Woodson | 2015-09-25 | 1 | -9/+44 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #612 from kwoodson/zbx_action | Kenny Woodson | 2015-09-25 | 1 | -0/+538 |
|\ \ \ \ | | | | | | | | | | | First attempt at a ansible zabbix action class | ||||
| * | | | | Initial stab at zabbix actions | Kenny Woodson | 2015-09-25 | 1 | -0/+538 |
| |/ / / | |||||
* | | | | Merge pull request #615 from openshift/dynamic_filesystem | Matt Woodson | 2015-09-25 | 2 | -0/+46 |
|\ \ \ \ | |_|/ / |/| | | | added support for dynamic keys and items | ||||
| * | | | added support for dynaic keys and items. added dynamic filesystems to zabbix | Matt Woodson | 2015-09-25 | 2 | -0/+46 |
|/ / / | |||||
* | | | Merge pull request #590 from dak1n1/s3 | Stefanie Forrester | 2015-09-24 | 2 | -0/+70 |
|\ \ \ | |/ / |/| | | Added S3 docker-registry config script | ||||
| * | | added dynamic inventory support for single-master clusters | Stefanie Forrester | 2015-09-24 | 2 | -11/+6 |
| | | | |||||
| * | | Added S3 docker-registry config script | Stefanie Forrester | 2015-09-23 | 2 | -0/+75 |
|/ / | |||||
* | | Merge pull request #605 from kwoodson/tmp2 | Matt Woodson | 2015-09-22 | 2 | -4/+11 |
|\ \ | | | | | | | Adding support for prototypes and discoveryrules | ||||
| * | | Added descriptions and parameters required for associating prototypes to ↵ | Kenny Woodson | 2015-09-22 | 2 | -4/+11 |
|/ / | | | | | | | discovery rules. | ||||
* | | Merge pull request #603 from kwoodson/tmp1 | Matt Woodson | 2015-09-22 | 2 | -9/+5 |
|\ \ | | | | | | | Adding support for prototypes and discoveryrules | ||||
| * | | Fixed a bug and removed the need for template and discoveryrule | Kenny Woodson | 2015-09-22 | 2 | -9/+5 |
| | | | |||||
* | | | Merge pull request #602 from kwoodson/tmp1 | Matt Woodson | 2015-09-22 | 2 | -16/+76 |
|\| | | |/ |/| | Adding support for prototypes and discoveryrules | ||||
| * | Fixed a few bugs and added support for prototypes and discoveryrules. | Kenny Woodson | 2015-09-22 | 2 | -16/+76 |
|/ | |||||
* | Merge pull request #598 from mwoodson/cleanup | Matt Woodson | 2015-09-21 | 1 | -4/+3 |
|\ | | | | | made docker cleanup exclude certain regitries | ||||
| * | changed the docker cleanup to exclude certain registries | Matt Woodson | 2015-09-21 | 1 | -4/+3 |
|/ | |||||
* | Merge pull request #597 from mwoodson/cleanup | Matt Woodson | 2015-09-21 | 1 | -3/+4 |
|\ | | | | | removed dangerous docker cleanup option | ||||
| * | commented out dangerous playbook option for cleanup | Matt Woodson | 2015-09-21 | 1 | -3/+4 |
|/ | |||||
* | Merge pull request #595 from sdodson/v106-changes | Brenton Leanhardt | 2015-09-18 | 1 | -5/+1 |
|\ | | | | | Update origin paths for v1.0.6 | ||||
| * | Update origin paths for v1.0.6 | Scott Dodson | 2015-09-18 | 1 | -5/+1 |
| | | | | | | | | | | | | | | Origin now uses /etc/origin and /var/lib/origin as of v1.0.6. The RPMs will create a symlinks from /etc/origin to /etc/openshift and /var/lib/origin to /var/lib/openshift if the openshift directories exist. However on clean installs /etc/openshift won't exist. | ||||
* | | Merge pull request #594 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 2 | -2/+78 |
|\ \ | | | | | | | added docker_storage_cleanup playbook | ||||
| * | | added playbook for docker storage cleanup | Matt Woodson | 2015-09-18 | 2 | -2/+78 |
| | | | |||||
* | | | Merge pull request #593 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 1 | -2/+5 |
|\| | | | | | | | | cleaned up some errors in loopback playbook | ||||
| * | | cleaned up some errors in loopback playbook | Matt Woodson | 2015-09-18 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #592 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 2 | -0/+143 |
|\| | | | | | | | | added loopback fixer playbook | ||||
| * | | added the docker loopback fixer script | Matt Woodson | 2015-09-18 | 2 | -0/+143 |
|/ / | |||||
* | | Merge pull request #588 from twiest/pr | Thomas Wiest | 2015-09-17 | 3 | -0/+46 |
|\ \ | |/ |/| | Added zabbix item openshift.master.process.exist and trigger to watch it. | ||||
| * | Added zabbix item openshift.master.process.exist and trigger to watch it. | Thomas Wiest | 2015-09-17 | 3 | -0/+46 |
|/ | |||||
* | Merge pull request #569 from dak1n1/service_accounts | Stefanie Forrester | 2015-09-11 | 3 | -0/+39 |
|\ | | | | | Set up service accounts for router and registry |