summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #286 from sdodson/contrib-guideBrenton Leanhardt2015-08-171-0/+3
|\
| * Add links to style guide, best practices in README.mdScott Dodson2015-06-171-0/+3
* | Merge pull request #410 from codificat/rhel-reposBrenton Leanhardt2015-08-171-0/+4
|\ \
| * | Remove the 'optional' repositoryPep Turró Mauri2015-08-121-1/+0
| * | Fine tune RHEL reposPep Turró Mauri2015-08-021-0/+5
* | | Merge pull request #456 from aveshagarwal/ae-ansible-merge-containerBrenton Leanhardt2015-08-172-0/+32
|\ \ \
| * | | Updated Dockerfile not to clone openshift-ansible repo.Avesh Agarwal2015-08-142-4/+6
| * | | Removed white spaces.Avesh Agarwal2015-08-141-4/+1
| * | | Renamed README_ANSIBLE to README_ANSIBLE_CONTAINER as per feedback.Avesh Agarwal2015-08-141-0/+0
| * | | Added README_ANSIBLE.md file that contains instructions to build and runAvesh Agarwal2015-08-142-2/+20
| * | | Changes to Dockerfile to make it work with openshift-ansible andAvesh Agarwal2015-08-141-10/+3
| * | | add RHEL7 DockerfileAaron Weitekamp2015-08-141-0/+22
* | | | Merge pull request #443 from aveshagarwal/ae-ansible-merge-docThomas Wiest2015-08-144-7/+248
|\ \ \ \
| * | | | 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
* | | | | Merge pull request #358 from lhuard1A/selinux-disabledThomas Wiest2015-08-141-1/+6
|\ \ \ \ \
| * | | | | 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 python2John T Skarbek2015-08-054-4/+4
* | | | | | | Merge pull request #460 from detiber/serverArgsThomas Wiest2015-08-144-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Add support for setting kubeletArguments, controllerArguments, and apiServerA...Jason DeTiberus2015-08-134-0/+12
* | | | | | | | Merge pull request #351 from codificat/vagrantfile-typeThomas Wiest2015-08-144-9/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | Use deployment_type, not openshift_deployment_typePep Turró Mauri2015-08-032-3/+3
| * | | | | | | | Move rhel_subscribe tasks to its own playbookPep Turró Mauri2015-08-032-11/+13
| * | | | | | | | 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 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 emptyWesley Hearn2015-08-141-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #466 from sdodson/require-etcd-2Brenton Leanhardt2015-08-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Require etcd 2.*Scott Dodson2015-08-131-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #473 from lhuard1A/fix_pylintWesley Hearn2015-08-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | 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_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.Avesh Agarwal2015-08-131-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #464 from dak1n1/fix_pauseStefanie Forrester2015-08-131-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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 selectorJason DeTiberus2015-08-123-1/+5
* | | | | | Merge pull request #416 from spinolacastro/fix_labelsWesley Hearn2015-08-124-1/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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