summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #443 from aveshagarwal/ae-ansible-merge-docThomas Wiest2015-08-144-7/+248
|\ | | | | AE->OSO ansible doc merge
| * Changed the string Master to master to make it more readable.Avesh Agarwal2015-08-131-1/+1
| |
| * Changes to make documentation less specific to OSE or AE and alsoAvesh Agarwal2015-08-134-7/+248
| | | | | | | | adds README_AEP.md.
* | Merge pull request #358 from lhuard1A/selinux-disabledThomas Wiest2015-08-141-1/+6
|\ \ | | | | | | Make the playbooks friendlier with SELinux disabled hosts
| * | Force SELinux on "enterprise" deployment typeLénaïc Huard2015-08-131-0/+3
| | |
| * | Make the playbooks friendlier with SELinux disabled hostsLénaïc Huard2015-07-171-1/+3
| | |
* | | Merge pull request #428 from jtslear/issue-383Thomas Wiest2015-08-144-4/+4
|\ \ \ | | | | | | | | Removes hardcoded python2
| * | | Removes hardcoded python2John T Skarbek2015-08-054-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/serverArgsThomas Wiest2015-08-144-0/+12
|\ \ \ \ | | | | | | | | | | Add support for setting kubeletArguments, controllerArguments, and apiServerArguments
| * | | | Add support for setting kubeletArguments, controllerArguments, and ↵Jason DeTiberus2015-08-134-0/+12
| | | | | | | | | | | | | | | | | | | | apiServerArguments
* | | | | Merge pull request #351 from codificat/vagrantfile-typeThomas Wiest2015-08-144-9/+76
|\ \ \ \ \ | | | | | | | | | | | | Reference deployment_type instead of hardcoding origin
| * | | | | Use deployment_type, not openshift_deployment_typePep Turró Mauri2015-08-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This seems to be what's used in other places
| * | | | | Move rhel_subscribe tasks to its own playbookPep Turró Mauri2015-08-032-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | Allows reuse out of vagrant, e.g. to subscribe systems by its own
| * | | | | Deploying enterprise with VagrantPep Turró Mauri2015-08-033-8/+73
| | | | | |
| * | | | | Reference deployment_type instead of hardcoding originPep Turró Mauri2015-08-031-1/+1
| | | | | |
* | | | | | Merge pull request #477 from wshearn/correct_instance_size_for_onlineWesley Hearn2015-08-143-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update instance sizes for online
| * | | | | | Update instance sizes for onlineWesley Hearn2015-08-143-6/+6
|/ / / / / /
* | | | | | Merge pull request #475 from wshearn/fix_labelWesley Hearn2015-08-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Skip node label if labels are empty
| * | | | | | Skip node label if labels are emptyWesley Hearn2015-08-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #466 from sdodson/require-etcd-2Brenton Leanhardt2015-08-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Require etcd-2.*
| * | | | | | Require etcd 2.*Scott Dodson2015-08-131-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_pylintWesley Hearn2015-08-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix pylint errors on oo_filters.py
| * | | | | | Fix pylint errors on oo_filters.pyLénaïc Huard2015-08-141-2/+2
| | | | | | |
* | | | | | | Merge pull request #467 from detiber/fixNodeLabelingWesley Hearn2015-08-142-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for node labeling where internal node name != inventory_hostname
| * | | | | | | Fix for node labeling where internal node name != inventory_hostnameJason DeTiberus2015-08-132-5/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #407 from aveshagarwal/ae-ansible-merge-authBrenton Leanhardt2015-08-141-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Enable htpasswd by default in the example hosts file.
| * | | | | | Enable htpasswd by default in the example hosts file.Avesh Agarwal2015-08-131-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #464 from dak1n1/fix_pauseStefanie Forrester2015-08-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | pause for a minimum of 15 seconds
| * | | | | make sure that number is an intStefanie Forrester2015-08-131-1/+1
| | | | | |
| * | | | | pause for a minimum of 15 secondsStefanie Forrester2015-08-131-1/+1
|/ / / / /
* | | | | Merge pull request #450 from detiber/addDefaultNodeSelectorThomas Wiest2015-08-133-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | Add support for setting default node selector
| * | | | Add support for setting default node selectorJason DeTiberus2015-08-123-1/+5
| | | | |
* | | | | Merge pull request #416 from spinolacastro/fix_labelsWesley Hearn2015-08-124-1/+32
|\ \ \ \ \ | |/ / / / |/| | | | Fix node labeling. Issue #305
| * | | | Notes for schedule behavior.Diego Castro (dscastro)2015-08-121-0/+12
| | | | |
| * | | | Don't try to label node if there's no labelsDiego Castro2015-08-101-0/+2
| | | | |
| * | | | Fix node labelsDiego Castro2015-08-102-7/+3
| | | | |
| * | | | Applying changes suggested by @sdodsonDiego Castro (dscastro)2015-08-041-3/+3
| | | | |
| * | | | Fix node labeling. Issue #305Diego Castro2015-08-043-1/+22
| | | | |
* | | | | Merge pull request #429 from spinolacastro/custom_corsBrenton Leanhardt2015-08-123-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Custom cors configuration
| * | | | | Fix Custom CorsDiego Castro2015-08-123-1/+7
| |/ / / /
* | | | | Merge pull request #454 from kwoodson/cleanupKenny Woodson2015-08-125-84/+2
|\ \ \ \ \ | | | | | | | | | | | | zbx_item fix and removed files
| * | | | | zbx item now uses key as default name. Clean up.Kenny Woodson2015-08-125-84/+2
|/ / / / /
* | | | | Merge pull request #451 from kwoodson/completionKenny Woodson2015-08-124-8/+29
|\ \ \ \ \ | | | | | | | | | | | | bash completion fix.
| * | | | | Updated to read config first and default to users home dirKenny Woodson2015-08-124-8/+29
|/ / / / /
* | | | | Merge pull request #440 from lhuard1A/infra_node_support_openstackThomas Wiest2015-08-123-11/+105
|\ \ \ \ \ | | | | | | | | | | | | Infra node support for OpenStack
| * | | | | Infra node support for OpenStackLénaïc Huard2015-08-123-11/+105
| | | | | |
* | | | | | Merge pull request #381 from pat2man/aws-fixesThomas Wiest2015-08-122-3/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | Switch to Centos and enable SDN on origin.
| * | | | | | Switch to Centos and enable SDN on origin.Patrick Tescher2015-07-222-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fedora 21 doesn’t seem to have docker 1.6.2. Centos does. Also without SDN networking was not working on AWS.
* | | | | | | Merge pull request #441 from lhuard1A/ansible_host_key_checking_falseThomas Wiest2015-08-121-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent Ansible from serializing tasks
| * | | | | | | Prevent Ansible from serializing tasksLénaïc Huard2015-08-111-0/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | even if the ssh known_host file misses the ssh public host keys of the servers.