Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | Create service accounts and set up scc rules | Stefanie Forrester | 2015-09-10 | 3 | -0/+39 |
| | | |||||
* | | Merge pull request #577 from kwoodson/tmp | Matt Woodson | 2015-09-11 | 2 | -4/+4 |
|\ \ | |/ |/| | Fixing a few zbx api issues to make idempotency work. | ||||
| * | 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 |
| | | | |||||
* | | | Merge pull request #573 from kwoodson/triggerfix | Kenny Woodson | 2015-09-10 | 2 | -5/+8 |
|\ \ \ | |/ / |/| | | Adding support for triggers to have descriptions. | ||||
| * | | 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 #564 from jtslear/minor-error | Wesley Hearn | 2015-09-09 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a minor bug involving AWS ENV Keys | ||||
| * | | Fix a minor bug involving AWS ENV Keys | John T Skarbek | 2015-09-05 | 1 | -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_size | Wesley Hearn | 2015-09-09 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Default masters to t2.medium instead of t2.small | ||||
| * | | | Default masters to t2.medium instead of t2.small | Wesley Hearn | 2015-09-09 | 3 | -3/+3 |
|/ / / | |||||
* | | | 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 |
| | | | |||||
* | | | Merge pull request #563 from sdodson/fix-recursive-loop | Brenton Leanhardt | 2015-09-08 | 4 | -4/+4 |
|\ \ \ | |_|/ |/| | | Avoid a recursive loop | ||||
| * | | Avoid a recursive loop | Scott Dodson | 2015-09-04 | 4 | -4/+4 |
|/ / | |||||
* | | Merge pull request #558 from sdodson/version-pinning | Brenton Leanhardt | 2015-09-04 | 8 | -6/+12 |
|\ \ | | | | | | | Add openshift_version to set RPM versions | ||||
| * | | Add openshift_version to set RPM versions | Scott Dodson | 2015-09-03 | 8 | -6/+12 |
| | | | | | | | | | | | | 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 | ||||
| * | | | added mem.util.available | Matt Woodson | 2015-09-04 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #555 from umairmufti/issue-554 | Wesley Hearn | 2015-09-04 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Fix to ensure use_openshift_sdn is a boolean value. | ||||
| * | | | | Fix to ensure use_openshift_sdn is a boolean value. | Umair Mufti | 2015-09-03 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #561 from mmahut/url | Marek Mahut | 2015-09-04 | 3 | -0/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding url to triggers | ||||
| * | | | | | Adding url to triggers | Marek Mahut | 2015-09-04 | 3 | -0/+13 |
|/ / / / / | |||||
* | | | | | Merge pull request #559 from kwoodson/tmp | Matt Woodson | 2015-09-03 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Added support for trigger urls | ||||
| * | | | | | Added trigger url | Kenny Woodson | 2015-09-03 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #556 from mwoodson/triggers | Matt Woodson | 2015-09-03 | 1 | -0/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | heartbeat sop url | ||||
| * | | | | added url to the heartbeat check | Matt Woodson | 2015-09-03 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #557 from kwoodson/triggerurl | Matt Woodson | 2015-09-03 | 1 | -2/+16 |
|\ \ \ \ | |/ / / |/| | | | Added support for trigger urls | ||||
| * | | | Adding url support for triggers | Kenny Woodson | 2015-09-03 | 1 | -2/+16 |
| |/ / | |||||
* | | | Merge pull request #553 from detiber/vagrant_centos | Brenton Leanhardt | 2015-09-03 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | Use official centos images for Vagrantfile | ||||
| * | | | Use official centos images for Vagrantfile | Jason DeTiberus | 2015-09-03 | 1 | -5/+4 |
| |/ / |