summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #651 from twiest/cprThomas Wiest2015-10-024-5/+38
|\ | | | | added Template Ops Tools
| * added Template Ops ToolsThomas Wiest2015-10-024-5/+38
|/
* Merge pull request #650 from smunilla/masterBrenton Leanhardt2015-10-021-0/+2
|\ | | | | openshift_facts.py: Correct error case for uninstalled systems
| * openshift_facts.py: Correct error case for uninstalled systemsSamuel Munilla2015-10-021-0/+2
|/ | | | | | This adds a default value to the version to cover the case where the user doesn't have /usr/bin/openshift on the system, correcting the bug found in PR #646.
* Merge pull request #639 from jaryn/localonly_dnsBrenton Leanhardt2015-10-011-1/+1
|\ | | | | Prevent dns resolution recursion (loop).
| * Prevent dns resolution recursion (loop).Jaroslav Henner2015-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dnsmasq should not be resolving the example.com recursively, because in case that we have /etc/NetworkManager/dnsmasq.d/libvirt_dnsmasq.conf: server=/example.com/192.168.55.1 the dnsmasq will be asking itself, therefore a dns resolution loop is created, which causes Maximum number of concurrent DNS queries reached (max: 150) and performance degradation of dns resolution on the whole hypervizor and guests. This patch will fix that in the domain.xml, which will cause adding local=/example.com/ to the /var/lib/libvirt/dnsmasq/openshift-ansible.conf, effectively fixing the problem.
* | Merge pull request #646 from smunilla/masterWesley Hearn2015-10-011-0/+14
|\ \ | | | | | | openshift_facts.py: Ansible fact for openshift version
| * | openshift_facts.py: Ansible fact for openshift versionSamuel Munilla2015-10-011-0/+14
|/ / | | | | | | | | | | This added some logic to add a new the version of openshift rpm-based installations. This fact is intentionally not cached to account for users potenially updating versions outside of ansible playbooks.
* | Merge pull request #644 from dak1n1/logrotateStefanie Forrester2015-10-012-2/+2
|\ \ | | | | | | added 'missingok' to logrotate and disabled fluentd in online
| * | added 'missingok' to logrotate and disabled fluentd in onlineStefanie Forrester2015-10-012-2/+2
|/ /
* | Merge pull request #643 from kwoodson/cputrigKenny Woodson2015-10-011-0/+15
|\ \ | | | | | | Adding zabbix triggers for cpu idle
| * | Adding trggers for cpu idleKenny Woodson2015-10-011-0/+15
|/ /
* | Merge pull request #640 from kwoodson/unitsKenny Woodson2015-09-301-0/+8
|\ \ | | | | | | Adding % units for kernel.all.cpu items
| * | Adding % to unitsKenny Woodson2015-09-301-0/+8
|/ /
* | Merge pull request #636 from kwoodson/quick1Kenny Woodson2015-09-301-8/+8
|\ \ | | | | | | Correcting cpu types to floats for percentage
| * | Updating these to the correct typeKenny Woodson2015-09-301-8/+8
|/ /
* | Merge pull request #611 from wshearn/fix_product_typeWesley Hearn2015-09-301-1/+1
|\ \ | | | | | | Add missing ,
| * | Add missing ,Wesley Hearn2015-09-241-1/+1
| | |
* | | Merge pull request #582 from sdodson/upgradesBrenton Leanhardt2015-09-3013-8/+153
|\ \ \ | | | | | | | | Upgrade playbook
| * | | UpgradesScott Dodson2015-09-2313-8/+153
| | | |
* | | | Merge pull request #634 from abutcher/whats-nextBrenton Leanhardt2015-09-303-46/+11
|\ \ \ \ | | | | | | | | | | Point to advanced installation guide for post install steps
| * | | | Point to advanced installation guide in READMEsAndrew Butcher2015-09-303-46/+11
|/ / / /
* | | | Merge pull request #630 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-2/+1
|\ \ \ \ | | | | | | | | | | added pylint as a package to ansible-tower
| * | | | added pylint as a package to ansible-towerMatt Woodson2015-09-291-2/+1
| | | | |
* | | | | Merge pull request #629 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-0/+2
|\| | | | | | | | | | | | | | don't want file ext in prod
| * | | | added comment to the grow_docker_vg playbookMatt Woodson2015-09-291-0/+2
| | | | |
* | | | | Merge pull request #628 from mwoodson/grow_docker_vgMatt Woodson2015-09-292-0/+245
|\| | | | | | | | | | | | | | added the grow_docker_vg adhoc playbook
| * | | | added the grow_docker_vg adhoc playbookMatt Woodson2015-09-292-0/+245
|/ / / /
* | | | Merge pull request #626 from kwoodson/quickMatt Woodson2015-09-281-0/+4
|\ \ \ \ | | | | | | | | | | Error handling added
| * | | | Added some debug when zbxapi has an issueKenny Woodson2015-09-281-0/+4
|/ / / /
* | | | Merge pull request #625 from kwoodson/triggerprotoKenny Woodson2015-09-284-1/+216
|\ \ \ \ | | | | | | | | | | Adding trigger prototype support
| * | | | Trigger prototype supportKenny Woodson2015-09-284-1/+216
| | | | |
* | | | | Merge pull request #624 from abutcher/merge-factsBrenton Leanhardt2015-09-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Avoid attribute error in merge facts
| * | | | | Only continue to merge facts if both old and new values are type dict.Andrew Butcher2015-09-281-1/+1
| |/ / / /
* | | | | Merge pull request #613 from jaryn/patch-1Brenton Leanhardt2015-09-281-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Fix bullets in libvirt readme
| * | | | Fix bullets in libvirt readmeJaroslav Henner2015-09-251-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #616 from kwoodson/tmp3Kenny Woodson2015-09-251-9/+44
|\ \ \ \ | | | | | | | | | | Required updates to zabbix user media
| * | | | Updates to zbx_user_mediaKenny Woodson2015-09-251-9/+44
| | |_|/ | |/| |
* | | | Merge pull request #612 from kwoodson/zbx_actionKenny Woodson2015-09-251-0/+538
|\ \ \ \ | | | | | | | | | | First attempt at a ansible zabbix action class
| * | | | Initial stab at zabbix actionsKenny Woodson2015-09-251-0/+538
| |/ / /
* | | | Merge pull request #615 from openshift/dynamic_filesystemMatt Woodson2015-09-252-0/+46
|\ \ \ \ | |_|/ / |/| | | added support for dynamic keys and items
| * | | added support for dynaic keys and items. added dynamic filesystems to zabbixMatt Woodson2015-09-252-0/+46
|/ / /
* | | Merge pull request #590 from dak1n1/s3Stefanie Forrester2015-09-242-0/+70
|\ \ \ | |/ / |/| | Added S3 docker-registry config script
| * | added dynamic inventory support for single-master clustersStefanie Forrester2015-09-242-11/+6
| | |
| * | Added S3 docker-registry config scriptStefanie Forrester2015-09-232-0/+75
|/ /
* | Merge pull request #605 from kwoodson/tmp2Matt Woodson2015-09-222-4/+11
|\ \ | | | | | | Adding support for prototypes and discoveryrules
| * | Added descriptions and parameters required for associating prototypes to ↵Kenny Woodson2015-09-222-4/+11
|/ / | | | | | | discovery rules.
* | Merge pull request #603 from kwoodson/tmp1Matt Woodson2015-09-222-9/+5
|\ \ | | | | | | Adding support for prototypes and discoveryrules
| * | Fixed a bug and removed the need for template and discoveryruleKenny Woodson2015-09-222-9/+5
| | |
* | | Merge pull request #602 from kwoodson/tmp1Matt Woodson2015-09-222-16/+76
|\| | | |/ |/| Adding support for prototypes and discoveryrules