Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'openshift/master' into project_config | Diego Castro | 2015-08-15 | 9 | -7/+42 |
|\ | |||||
| * | Merge pull request #443 from aveshagarwal/ae-ansible-merge-doc | Thomas Wiest | 2015-08-14 | 1 | -3/+3 |
| |\ | | | | | | | AE->OSO ansible doc merge | ||||
| | * | Changes to make documentation less specific to OSE or AE and also | Avesh Agarwal | 2015-08-13 | 1 | -3/+3 |
| | | | | | | | | | | | | adds README_AEP.md. | ||||
| * | | Merge pull request #358 from lhuard1A/selinux-disabled | Thomas Wiest | 2015-08-14 | 1 | -1/+6 |
| |\ \ | | | | | | | | | Make the playbooks friendlier with SELinux disabled hosts | ||||
| | * | | Force SELinux on "enterprise" deployment type | Lénaïc Huard | 2015-08-13 | 1 | -0/+3 |
| | | | | |||||
| | * | | Make the playbooks friendlier with SELinux disabled hosts | Lénaïc Huard | 2015-07-17 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #460 from detiber/serverArgs | Thomas Wiest | 2015-08-14 | 4 | -0/+12 |
| |\ \ \ | | | | | | | | | | | Add support for setting kubeletArguments, controllerArguments, and apiServerArguments | ||||
| | * | | | Add support for setting kubeletArguments, controllerArguments, and ↵ | Jason DeTiberus | 2015-08-13 | 4 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | apiServerArguments | ||||
| * | | | | Skip node label if labels are empty | Wesley Hearn | 2015-08-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #466 from sdodson/require-etcd-2 | Brenton Leanhardt | 2015-08-14 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Require etcd-2.* | ||||
| | * | | | | Require etcd 2.* | Scott Dodson | 2015-08-13 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #422 When etcd-2.1 is available in RHEL7 / Centos 7 we'll bumpt to that as it's considerably more stable with regard to WAL corruption and recovery. | ||||
| * | | | | Merge pull request #467 from detiber/fixNodeLabeling | Wesley Hearn | 2015-08-14 | 1 | -4/+3 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Fix for node labeling where internal node name != inventory_hostname | ||||
| | * | | | Fix for node labeling where internal node name != inventory_hostname | Jason DeTiberus | 2015-08-13 | 1 | -4/+3 |
| | |/ / | |||||
| * | | | make sure that number is an int | Stefanie Forrester | 2015-08-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | pause for a minimum of 15 seconds | Stefanie Forrester | 2015-08-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #450 from detiber/addDefaultNodeSelector | Thomas Wiest | 2015-08-13 | 2 | -1/+2 |
| |\ \ | | | | | | | | | Add support for setting default node selector | ||||
| | * | | Add support for setting default node selector | Jason DeTiberus | 2015-08-12 | 2 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #416 from spinolacastro/fix_labels | Wesley Hearn | 2015-08-12 | 2 | -0/+20 |
| |\ \ \ | | |/ / | |/| | | Fix node labeling. Issue #305 | ||||
| | * | | Notes for schedule behavior. | Diego Castro (dscastro) | 2015-08-12 | 1 | -0/+12 |
| | | | | |||||
| | * | | Don't try to label node if there's no labels | Diego Castro | 2015-08-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | Fix node labels | Diego Castro | 2015-08-10 | 1 | -4/+3 |
| | | | | |||||
| | * | | Applying changes suggested by @sdodson | Diego Castro (dscastro) | 2015-08-04 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fix node labeling. Issue #305 | Diego Castro | 2015-08-04 | 1 | -0/+7 |
| | | | | |||||
* | | | | Update PR #458 from comments | Diego Castro | 2015-08-12 | 3 | -30/+14 |
| | | | | |||||
* | | | | Custom Project Config | Diego Castro | 2015-08-12 | 4 | -9/+32 |
|/ / / | |||||
* | | | Merge pull request #429 from spinolacastro/custom_cors | Brenton Leanhardt | 2015-08-12 | 2 | -1/+4 |
|\ \ \ | | | | | | | | | Custom cors configuration | ||||
| * | | | Fix Custom Cors | Diego Castro | 2015-08-12 | 2 | -1/+4 |
| |/ / | |||||
* | | | zbx item now uses key as default name. Clean up. | Kenny Woodson | 2015-08-12 | 1 | -1/+1 |
| | | | |||||
* | | | Zabbix Idempotency | Kenny Woodson | 2015-08-11 | 11 | -382/+1286 |
| | | | |||||
* | | | Use the official redhat registry for online | Wesley Hearn | 2015-08-10 | 1 | -2/+1 |
| | | | |||||
* | | | take number of nodes into account when pausing | Stefanie Forrester | 2015-08-07 | 1 | -2/+2 |
| | | | |||||
* | | | added pause before td-agent restart | Stefanie Forrester | 2015-08-06 | 1 | -0/+3 |
| | | | |||||
* | | | Reduce heartbeat frequency to 500ms to reduce etcd cpu load | Scott Dodson | 2015-08-05 | 1 | -2/+2 |
|/ / | | | | | | | | | | | | | Per https://github.com/coreos/etcd/pull/3097 reduce heartbeat to 500ms until we can ensure etcd 2.1 is in use Reduces the impact of but doesn't fix BZ1250310 | ||||
* | | Add LDAPPasswordIdentityProvider bits to identity_provider_config macro. | Andrew Butcher | 2015-07-31 | 1 | -0/+14 |
| | | |||||
* | | Add support for setting routingConfig:subdomain | Jason DeTiberus | 2015-07-28 | 2 | -1/+2 |
| | | |||||
* | | Bug 1247461 - Fixing github triggers for the xpaas templates | Brenton Leanhardt | 2015-07-28 | 26 | -26/+26 |
| | | |||||
* | | Add a pause after node startup to prevent restart handler from interfering ↵ | Jason DeTiberus | 2015-07-24 | 1 | -0/+5 |
| | | | | | | | | with sdn configuration | ||||
* | | Merge pull request #390 from sdodson/updated-examples | Brenton Leanhardt | 2015-07-24 | 42 | -331/+362 |
|\ \ | | | | | | | Updated examples content | ||||
| * | | Updated examples | Scott Dodson | 2015-07-24 | 42 | -331/+362 |
| | | | |||||
* | | | Copy more master certs for HA master | Jason DeTiberus | 2015-07-23 | 1 | -0/+16 |
|/ / | |||||
* | | Fix generation of node certificates | Jason DeTiberus | 2015-07-22 | 1 | -1/+1 |
| | | |||||
* | | Add masterCA to ServiceAccountConfig | Scott Dodson | 2015-07-21 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #374 from detiber/ha_master | Brenton Leanhardt | 2015-07-20 | 2 | -5/+5 |
|\ \ | | | | | | | properly test openshift_master_ha var | ||||
| * | | properly test openshift_master_ha var | Jason DeTiberus | 2015-07-20 | 2 | -5/+5 |
| | | | |||||
* | | | Merge pull request #362 from sdodson/issue361 | Brenton Leanhardt | 2015-07-20 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Issue361 - MatchNodeSelector should be first | ||||
| * | | | Issue361 - MatchNodeSelector should be first | Scott Dodson | 2015-07-17 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #365 from detiber/ha_master | Thomas Wiest | 2015-07-19 | 4 | -3/+4 |
|\ \ \ | | |/ | |/| | Update dependencies to ensure repos are available before openshift_master_* and etcd_* roles are run | ||||
| * | | Update dependencies to ensure repos are available before openshift_master_* ↵ | Jason DeTiberus | 2015-07-17 | 4 | -3/+4 |
| | | | | | | | | | | | | and etcd_* roles are run | ||||
* | | | Merge pull request #363 from detiber/ha_master | Thomas Wiest | 2015-07-17 | 1 | -1/+2 |
|\| | | | | | | | | Add an initial delay for clustered HA startup verification | ||||
| * | | Add an initial delay for clustered HA startup verification | Jason DeTiberus | 2015-07-17 | 1 | -1/+2 |
| | | |