summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fixed a few bugs and added support for prototypes and discoveryrules.Kenny Woodson2015-09-222-16/+76
|/
* Merge pull request #598 from mwoodson/cleanupMatt Woodson2015-09-211-4/+3
|\ | | | | made docker cleanup exclude certain regitries
| * changed the docker cleanup to exclude certain registriesMatt Woodson2015-09-211-4/+3
|/
* Merge pull request #597 from mwoodson/cleanupMatt Woodson2015-09-211-3/+4
|\ | | | | removed dangerous docker cleanup option
| * commented out dangerous playbook option for cleanupMatt Woodson2015-09-211-3/+4
|/
* 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.
* | Merge pull request #594 from mwoodson/docker_loopbackMatt Woodson2015-09-182-2/+78
|\ \ | | | | | | added docker_storage_cleanup playbook
| * | added playbook for docker storage cleanupMatt Woodson2015-09-182-2/+78
| | |
* | | Merge pull request #593 from mwoodson/docker_loopbackMatt Woodson2015-09-181-2/+5
|\| | | | | | | | cleaned up some errors in loopback playbook
| * | cleaned up some errors in loopback playbookMatt Woodson2015-09-181-2/+5
| | |
* | | Merge pull request #592 from mwoodson/docker_loopbackMatt Woodson2015-09-182-0/+143
|\| | | | | | | | added loopback fixer playbook
| * | added the docker loopback fixer scriptMatt Woodson2015-09-182-0/+143
|/ /
* | Merge pull request #588 from twiest/prThomas Wiest2015-09-173-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 Wiest2015-09-173-0/+46
|/
* Merge pull request #569 from dak1n1/service_accountsStefanie Forrester2015-09-113-0/+39
|\ | | | | Set up service accounts for router and registry
| * Create service accounts and set up scc rulesStefanie Forrester2015-09-103-0/+39
| |
* | Merge pull request #577 from kwoodson/tmpMatt Woodson2015-09-112-4/+4
|\ \ | |/ |/| Fixing a few zbx api issues to make idempotency work.
| * 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
| | |
* | | Merge pull request #573 from kwoodson/triggerfixKenny Woodson2015-09-102-5/+8
|\ \ \ | |/ / |/| | Adding support for triggers to have descriptions.
| * | 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 #564 from jtslear/minor-errorWesley Hearn2015-09-091-1/+1
|\ \ | | | | | | Fix a minor bug involving AWS ENV Keys
| * | Fix a minor bug involving AWS ENV KeysJohn T Skarbek2015-09-051-1/+1
| | | | | | | | | | | | | | | * If a user forgot to set their AWS keys, we'd get a non descriptive error about a variable not being set * This patch uses the correct variable so the error message is more informative
* | | Merge pull request #567 from wshearn/update_master_sizeWesley Hearn2015-09-093-3/+3
|\ \ \ | | | | | | | | Default masters to t2.medium instead of t2.small
| * | | Default masters to t2.medium instead of t2.smallWesley Hearn2015-09-093-3/+3
|/ / /
* | | 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
| | |
* | | Merge pull request #563 from sdodson/fix-recursive-loopBrenton Leanhardt2015-09-084-4/+4
|\ \ \ | |_|/ |/| | Avoid a recursive loop
| * | Avoid a recursive loopScott Dodson2015-09-044-4/+4
|/ /
* | Merge pull request #558 from sdodson/version-pinningBrenton Leanhardt2015-09-048-6/+12
|\ \ | | | | | | Add openshift_version to set RPM versions
| * | Add openshift_version to set RPM versionsScott Dodson2015-09-038-6/+12
| | | | | | | | | | | | Mostly necessary for debugging / testing upgrade paths
* | | Merge pull request #562 from mwoodson/triggersMatt Woodson2015-09-041-0/+5
|\ \ \ | | | | | | | | added mem.util.available
| * | | added mem.util.availableMatt Woodson2015-09-041-0/+5
| | | |
* | | | Merge pull request #555 from umairmufti/issue-554Wesley Hearn2015-09-041-1/+4
|\ \ \ \ | | | | | | | | | | Fix to ensure use_openshift_sdn is a boolean value.
| * | | | Fix to ensure use_openshift_sdn is a boolean value.Umair Mufti2015-09-031-1/+4
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 23:55:35 +0000