summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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' .
* | Revert "GCE support"Thomas Wiest2015-10-053-3/+3
|/
* Merge pull request #641 from menren/gce-supportThomas Wiest2015-10-053-3/+3
|\ | | | | GCE support
| * openshift master public api url defaults to None, it will get its default ↵Chengcheng Mu2015-10-021-1/+1
| | | | | | | | | | | | value in openshift_facts commented infra-node code until it's solved
| * Removed some application specific code like insecure registries, heat templateChengcheng Mu2015-10-012-15/+0
| |
| * GCE-support (more information in PR, README_GCE.md)Chengcheng Mu2015-10-014-4/+19
| |
* | added Template Ops ToolsThomas Wiest2015-10-024-5/+38
| |
* | 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.
* | 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.
* | added 'missingok' to logrotate and disabled fluentd in onlineStefanie Forrester2015-10-011-2/+1
| |
* | Adding trggers for cpu idleKenny Woodson2015-10-011-0/+15
|/
* Adding % to unitsKenny Woodson2015-09-301-0/+8
|
* Updating these to the correct typeKenny Woodson2015-09-301-8/+8
|
* Merge pull request #582 from sdodson/upgradesBrenton Leanhardt2015-09-308-8/+14
|\ | | | | Upgrade playbook
| * UpgradesScott Dodson2015-09-238-8/+14
| |
* | added pylint as a package to ansible-towerMatt Woodson2015-09-291-2/+1
| |
* | 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
| | |
* | | Only continue to merge facts if both old and new values are type dict.Andrew Butcher2015-09-281-1/+1
|/ /
* | 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
| |/ /
* / / added support for dynaic keys and items. added dynamic filesystems to zabbixMatt Woodson2015-09-252-0/+46
|/ /
* | Added descriptions and parameters required for associating prototypes to ↵Kenny Woodson2015-09-222-4/+11
| | | | | | | | discovery rules.
* | Fixed a bug and removed the need for template and discoveryruleKenny Woodson2015-09-222-9/+5
| |
* | Fixed a few bugs and added support for prototypes and discoveryrules.Kenny Woodson2015-09-222-16/+76
|/
* Merge pull request #595 from sdodson/v106-changesBrenton Leanhardt2015-09-181-5/+1
|\ | | | | Update origin paths for v1.0.6
| * Update origin paths for v1.0.6Scott Dodson2015-09-181-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 Wiest2015-09-173-0/+46
|/
* Merge pull request #569 from dak1n1/service_accountsStefanie Forrester2015-09-112-0/+30
|\ | | | | Set up service accounts for router and registry
| * Create service accounts and set up scc rulesStefanie Forrester2015-09-102-0/+30
| |
* | Fixes for zbx apiKenny Woodson2015-09-112-4/+4
|/
* Merge pull request #570 from sdodson/openshift_data_dirBrenton Leanhardt2015-09-104-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_typeScott Dodson2015-09-104-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_itemsMatt Woodson2015-09-104-57/+81
|\ \ | | | | | | added more support for zabbix
| * | updated triggers and items to have better descriptions and multipliersMatt Woodson2015-09-104-57/+81
| | |
* | | Adding capability to have descriptions on triggersKenny Woodson2015-09-102-5/+8
|/ /
* | Merge pull request #566 from kwoodson/item_fixMatt Woodson2015-09-103-2/+40
|\ \ | |/ |/| Adding desc, units, and multiplier functionality to zabbix items.
| * Adding desc, multiplier, and units to zabbix itemKenny Woodson2015-09-083-2/+40
| |
* | Merge pull request #548 from sdodson/jenkins-renameWesley Hearn2015-09-084-11/+21
|\ \ | |/ |/| Jenkins image was renamed
| * Jenkins image was renamedScott Dodson2015-09-014-11/+21
| |
* | Avoid a recursive loopScott Dodson2015-09-043-3/+3
| |
* | Merge pull request #558 from sdodson/version-pinningBrenton Leanhardt2015-09-047-6/+9
|\ \ | | | | | | Add openshift_version to set RPM versions
| * | Add openshift_version to set RPM versionsScott Dodson2015-09-037-6/+9
| | | | | | | | | | | | Mostly necessary for debugging / testing upgrade paths
* | | Merge pull request #562 from mwoodson/triggersMatt Woodson2015-09-041-0/+5
|\ \ \ | | | | | | | | added mem.util.available