summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Merge pull request #561 from mmahut/urlMarek Mahut2015-09-043-0/+13
|\ \ \ \ | | | | | | | | | | Adding url to triggers
| * | | | Adding url to triggersMarek Mahut2015-09-043-0/+13
|/ / / /
* | | | Merge pull request #559 from kwoodson/tmpMatt Woodson2015-09-031-0/+1
|\ \ \ \ | | | | | | | | | | Added support for trigger urls
| * | | | Added trigger urlKenny Woodson2015-09-031-0/+1
|/ / / /
* | | | Merge pull request #556 from mwoodson/triggersMatt Woodson2015-09-031-0/+1
|\ \ \ \ | | |/ / | |/| | heartbeat sop url
| * | | added url to the heartbeat checkMatt Woodson2015-09-031-0/+1
| |/ /
* | | Merge pull request #557 from kwoodson/triggerurlMatt Woodson2015-09-031-2/+16
|\ \ \ | |/ / |/| | Added support for trigger urls
| * | Adding url support for triggersKenny Woodson2015-09-031-2/+16
| |/
* | Merge pull request #553 from detiber/vagrant_centosBrenton Leanhardt2015-09-031-5/+4
|\ \ | | | | | | Use official centos images for Vagrantfile
| * | Use official centos images for VagrantfileJason DeTiberus2015-09-031-5/+4
| |/
* | Merge pull request #522 from dak1n1/master_scheduleStefanie Forrester2015-09-034-16/+25
|\ \ | |/ |/| added new fact for schedulability and fixed spelling
| * added new node fact for schedulabilityStefanie Forrester2015-09-024-16/+25
|/
* Merge pull request #544 from sdodson/serviceNetworkCIDRBrenton Leanhardt2015-09-024-1/+13
|\ | | | | Add serviceNetworkCIDR and SDN MTU config
| * Add openshift_node_sdn_mtu configurationScott Dodson2015-09-023-1/+11
| | | | | | | | | | Sync's with Origin 1.0.6 and OSE 3.0.2 node-config.yaml networkConfig changes Fixes #534
| * Add serviceNetworkCIDR to network configScott Dodson2015-09-021-0/+2
| | | | | | | | Required by OSE 3.0.2 and Origin 1.0.6
* | Merge pull request #505 from dak1n1/waitfor_etcdStefanie Forrester2015-09-022-2/+8
|\ \ | | | | | | wait for ports instead of waiting for an arbitrary period of time
| * | wait for ports instead of waiting for an arbitrary period of timeStefanie Forrester2015-09-022-2/+8
| |/
* | Merge pull request #550 from twiest/prThomas Wiest2015-09-021-2/+2
|\ \ | |/ |/| relaxed the docker metadata triggers to be more in line with what docker-storage-setup allocates for metadata.
| * relaxed the docker metadata triggers to be more in line with what ↵Thomas Wiest2015-09-021-2/+2
|/ | | | docker-storage-setup allocates for metadata.
* Merge pull request #546 from kwoodson/appfixMatt Woodson2015-09-014-65/+93
|\ | | | | Application fixes for zabbix
| * Fix for zbx applicationsKenny Woodson2015-09-014-65/+93
|/
* Merge pull request #543 from mwoodson/triggersMatt Woodson2015-08-311-0/+25
|\ | | | | added triggers
| * added monitoring triggersMatt Woodson2015-08-311-0/+8
| |
| * added triggers for disk spaceMatt Woodson2015-08-311-0/+17
|/
* Merge pull request #541 from kwoodson/master_templKenny Woodson2015-08-312-0/+20
|\ | | | | app create in master template
| * Adding create appKenny Woodson2015-08-312-0/+20
| |
* | Merge pull request #530 from sdodson/fix-hosts-fileBrenton Leanhardt2015-08-311-2/+4
|\ \ | |/ |/| Make all nodes schedulable by default in byo example inventory
| * Make masters schedulable in byo exampleScott Dodson2015-08-311-2/+4
| | | | | | | | ... but note why you wouldn't want them to be
* | Merge pull request #539 from twiest/prKenny Woodson2015-08-3112-129/+133
|\ \ | |/ |/| added docker zabbix template, removed unused / old templates so they don't confuse other people.
| * added docker zabbix template, removed unused / old templates so they don't ↵Thomas Wiest2015-08-3112-129/+133
|/ | | | confuse other people.
* Merge pull request #533 from mwoodson/masterMatt Woodson2015-08-281-17/+2
|\ | | | | added disk monitoring
| * added filesys.fullMatt Woodson2015-08-281-17/+2
|/
* Merge pull request #512 from sdodson/nextWesley Hearn2015-08-2834-136/+208
|\ | | | | Merge in Atomic Enterprise work into master
| * Atomic Enterprise related changes.Avesh Agarwal2015-08-2634-136/+208
| |
* | Merge pull request #525 from cgwalters/tutorial-reset-no-imagesBrenton Leanhardt2015-08-281-0/+7
|\ \ | | | | | | adhoc/tutorial_reset: Cleanup the cleanup
| * | adhoc/tutorial_reset: Also delete etcd and dataColin Walters2015-08-271-0/+4
| | | | | | | | | | | | | | | | | | I needed this because I forgot to override openshift_hostname, and it found the wrong hostname, which then leaked into etcd certs, which caused the master to fail to start.
| * | adhoc/tutorial_reset: Don't error out if there are no Docker imagesColin Walters2015-08-271-0/+3
| | | | | | | | | | | | I'd like this playbook to always work.
* | | Merge pull request #527 from spinolacastro/metrics_fixWesley Hearn2015-08-281-2/+1
|\ \ \ | |/ / |/| | Make cluster_metrics disabled by default
| * | Fix testsDiego Castro (dscastro)2015-08-281-1/+0
| | |
| * | Make cluster_metrics disabled by defaultDiego Castro (dscastro)2015-08-281-1/+1
| | |
* | | Merge pull request #524 from kwoodson/zbxfixKenny Woodson2015-08-2711-22/+22
|\ \ \ | | | | | | | | Updating zabbix for env vars.
| * | | Fixed env var defaults.Kenny Woodson2015-08-2711-22/+22
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 03:43:53 +0000