Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #657 from liggitt/scheduler | Brenton Leanhardt | 2015-10-06 | 1 | -0/+2 |
|\ | | | | | Add kind/apiVersion to scheduler.json template | ||||
| * | Add kind/apiVersion to scheduler.json template | Jordan Liggitt | 2015-10-05 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #653 from arsogukpinar/master | Brenton Leanhardt | 2015-10-06 | 1 | -2/+2 |
|\ \ | |/ |/| | Fix for name conflict | ||||
| * | Fix for name conflict | Ali Sogukpinar | 2015-10-05 | 1 | -2/+2 |
| | | | | | | Template name is conflicting with the template name from 'eap6-basic-sti.json' . | ||||
* | | Revert "GCE support" | Thomas Wiest | 2015-10-05 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #641 from menren/gce-support | Thomas Wiest | 2015-10-05 | 3 | -3/+3 |
|\ | | | | | GCE support | ||||
| * | openshift master public api url defaults to None, it will get its default ↵ | Chengcheng Mu | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | value in openshift_facts commented infra-node code until it's solved | ||||
| * | Removed some application specific code like insecure registries, heat template | Chengcheng Mu | 2015-10-01 | 2 | -15/+0 |
| | | |||||
| * | GCE-support (more information in PR, README_GCE.md) | Chengcheng Mu | 2015-10-01 | 4 | -4/+19 |
| | | |||||
* | | added Template Ops Tools | Thomas Wiest | 2015-10-02 | 4 | -5/+38 |
| | | |||||
* | | openshift_facts.py: Correct error case for uninstalled systems | Samuel Munilla | 2015-10-02 | 1 | -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. | ||||
* | | openshift_facts.py: Ansible fact for openshift version | Samuel Munilla | 2015-10-01 | 1 | -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. | ||||
* | | added 'missingok' to logrotate and disabled fluentd in online | Stefanie Forrester | 2015-10-01 | 1 | -2/+1 |
| | | |||||
* | | Adding trggers for cpu idle | Kenny Woodson | 2015-10-01 | 1 | -0/+15 |
|/ | |||||
* | Adding % to units | Kenny Woodson | 2015-09-30 | 1 | -0/+8 |
| | |||||
* | Updating these to the correct type | Kenny Woodson | 2015-09-30 | 1 | -8/+8 |
| | |||||
* | Merge pull request #582 from sdodson/upgrades | Brenton Leanhardt | 2015-09-30 | 8 | -8/+14 |
|\ | | | | | Upgrade playbook | ||||
| * | Upgrades | Scott Dodson | 2015-09-23 | 8 | -8/+14 |
| | | |||||
* | | added pylint as a package to ansible-tower | Matt Woodson | 2015-09-29 | 1 | -2/+1 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | 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 #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 |
| |/ / | |||||
* / / | added support for dynaic keys and items. added dynamic filesystems to zabbix | Matt Woodson | 2015-09-25 | 2 | -0/+46 |
|/ / | |||||
* | | Added descriptions and parameters required for associating prototypes to ↵ | Kenny Woodson | 2015-09-22 | 2 | -4/+11 |
| | | | | | | | | discovery rules. | ||||
* | | Fixed a bug and removed the need for template and discoveryrule | Kenny Woodson | 2015-09-22 | 2 | -9/+5 |
| | | |||||
* | | Fixed a few bugs and added support for prototypes and discoveryrules. | Kenny Woodson | 2015-09-22 | 2 | -16/+76 |
|/ | |||||
* | 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. | ||||
* | | 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 | 2 | -0/+30 |
|\ | | | | | Set up service accounts for router and registry | ||||
| * | Create service accounts and set up scc rules | Stefanie Forrester | 2015-09-10 | 2 | -0/+30 |
| | | |||||
* | | Fixes for zbx api | Kenny Woodson | 2015-09-11 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #570 from sdodson/openshift_data_dir | Brenton Leanhardt | 2015-09-10 | 4 | -4/+11 |
|\ | | | | | Move openshift_data_dir to openshift.common.data_dir fact based on deployment_type | ||||
| * | Move openshift_data_dir to a fact based on deployment_type | Scott Dodson | 2015-09-10 | 4 | -4/+11 |
| | | | | | | | | | | | | Previously this was being set to /var/lib/origin regardless of deployment_type which isn't correct given that existing 'enterprise' and 'online' deployments would have been deployed with /var/lib/openshift | ||||
* | | Merge pull request #574 from openshift/mem_items | Matt Woodson | 2015-09-10 | 4 | -57/+81 |
|\ \ | | | | | | | added more support for zabbix | ||||
| * | | updated triggers and items to have better descriptions and multipliers | Matt Woodson | 2015-09-10 | 4 | -57/+81 |
| | | | |||||
* | | | Adding capability to have descriptions on triggers | Kenny Woodson | 2015-09-10 | 2 | -5/+8 |
|/ / | |||||
* | | Merge pull request #566 from kwoodson/item_fix | Matt Woodson | 2015-09-10 | 3 | -2/+40 |
|\ \ | |/ |/| | Adding desc, units, and multiplier functionality to zabbix items. | ||||
| * | Adding desc, multiplier, and units to zabbix item | Kenny Woodson | 2015-09-08 | 3 | -2/+40 |
| | | |||||
* | | Merge pull request #548 from sdodson/jenkins-rename | Wesley Hearn | 2015-09-08 | 4 | -11/+21 |
|\ \ | |/ |/| | Jenkins image was renamed | ||||
| * | Jenkins image was renamed | Scott Dodson | 2015-09-01 | 4 | -11/+21 |
| | | |||||
* | | Avoid a recursive loop | Scott Dodson | 2015-09-04 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #558 from sdodson/version-pinning | Brenton Leanhardt | 2015-09-04 | 7 | -6/+9 |
|\ \ | | | | | | | Add openshift_version to set RPM versions | ||||
| * | | Add openshift_version to set RPM versions | Scott Dodson | 2015-09-03 | 7 | -6/+9 |
| | | | | | | | | | | | | Mostly necessary for debugging / testing upgrade paths | ||||
* | | | Merge pull request #562 from mwoodson/triggers | Matt Woodson | 2015-09-04 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | added mem.util.available |