Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'openshift/master' into project_config | Diego Castro | 2015-08-15 | 26 | -31/+389 |
|\ | |||||
| * | Merge pull request #443 from aveshagarwal/ae-ansible-merge-doc | Thomas Wiest | 2015-08-14 | 4 | -7/+248 |
| |\ | | | | | | | AE->OSO ansible doc merge | ||||
| | * | Changed the string Master to master to make it more readable. | Avesh Agarwal | 2015-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | Changes to make documentation less specific to OSE or AE and also | Avesh Agarwal | 2015-08-13 | 4 | -7/+248 |
| | | | | | | | | | | | | 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 #428 from jtslear/issue-383 | Thomas Wiest | 2015-08-14 | 4 | -4/+4 |
| |\ \ \ | | | | | | | | | | | Removes hardcoded python2 | ||||
| | * | | | Removes hardcoded python2 | John T Skarbek | 2015-08-05 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replaces the hard coded items in favor of pulling a users environment * resolves #383 * Feedback and/or additional testing is more than welcome | ||||
| * | | | | 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 | ||||
| * | | | | | Merge pull request #351 from codificat/vagrantfile-type | Thomas Wiest | 2015-08-14 | 4 | -9/+76 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Reference deployment_type instead of hardcoding origin | ||||
| | * | | | | | Use deployment_type, not openshift_deployment_type | Pep Turró Mauri | 2015-08-03 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be what's used in other places | ||||
| | * | | | | | Move rhel_subscribe tasks to its own playbook | Pep Turró Mauri | 2015-08-03 | 2 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows reuse out of vagrant, e.g. to subscribe systems by its own | ||||
| | * | | | | | Deploying enterprise with Vagrant | Pep Turró Mauri | 2015-08-03 | 3 | -8/+73 |
| | | | | | | | |||||
| | * | | | | | Reference deployment_type instead of hardcoding origin | Pep Turró Mauri | 2015-08-03 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #477 from wshearn/correct_instance_size_for_online | Wesley Hearn | 2015-08-14 | 3 | -6/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update instance sizes for online | ||||
| | * | | | | | | Update instance sizes for online | Wesley Hearn | 2015-08-14 | 3 | -6/+6 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #475 from wshearn/fix_label | Wesley Hearn | 2015-08-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Skip node label if labels are empty | ||||
| | * | | | | | | 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 #473 from lhuard1A/fix_pylint | Wesley Hearn | 2015-08-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix pylint errors on oo_filters.py | ||||
| | * | | | | | | Fix pylint errors on oo_filters.py | Lénaïc Huard | 2015-08-14 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #467 from detiber/fixNodeLabeling | Wesley Hearn | 2015-08-14 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+5 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #407 from aveshagarwal/ae-ansible-merge-auth | Brenton Leanhardt | 2015-08-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Enable htpasswd by default in the example hosts file. | ||||
| | * | | | | | | Enable htpasswd by default in the example hosts file. | Avesh Agarwal | 2015-08-13 | 1 | -1/+1 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #464 from dak1n1/fix_pause | Stefanie Forrester | 2015-08-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | pause for a minimum of 15 seconds | ||||
| | * | | | | | 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 | 3 | -1/+5 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Add support for setting default node selector | ||||
| | * | | | | Add support for setting default node selector | Jason DeTiberus | 2015-08-12 | 3 | -1/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #416 from spinolacastro/fix_labels | Wesley Hearn | 2015-08-12 | 4 | -1/+32 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | 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 | 2 | -7/+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 | 3 | -1/+22 |
| | | | | | | |||||
* | | | | | | Add missing inventory example | Diego Castro | 2015-08-12 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | Update PR #458 from comments | Diego Castro | 2015-08-12 | 3 | -30/+14 |
| | | | | | | |||||
* | | | | | | Custom Project Config | Diego Castro | 2015-08-12 | 5 | -9/+35 |
|/ / / / / | |||||
* | | | | | Merge pull request #429 from spinolacastro/custom_cors | Brenton Leanhardt | 2015-08-12 | 3 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Custom cors configuration | ||||
| * | | | | | Fix Custom Cors | Diego Castro | 2015-08-12 | 3 | -1/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #454 from kwoodson/cleanup | Kenny Woodson | 2015-08-12 | 5 | -84/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | zbx_item fix and removed files | ||||
| * | | | | | zbx item now uses key as default name. Clean up. | Kenny Woodson | 2015-08-12 | 5 | -84/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #451 from kwoodson/completion | Kenny Woodson | 2015-08-12 | 4 | -8/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | bash completion fix. | ||||
| * | | | | | Updated to read config first and default to users home dir | Kenny Woodson | 2015-08-12 | 4 | -8/+29 |
|/ / / / / | |||||
* | | | | | Merge pull request #440 from lhuard1A/infra_node_support_openstack | Thomas Wiest | 2015-08-12 | 3 | -11/+105 |
|\ \ \ \ \ | | | | | | | | | | | | | Infra node support for OpenStack | ||||
| * | | | | | Infra node support for OpenStack | Lénaïc Huard | 2015-08-12 | 3 | -11/+105 |
| | | | | | |