summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #503 from detiber/fixKubeArgsBrenton Leanhardt2015-08-261-8/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix quoting around nullJason DeTiberus2015-08-221-2/+2
| * | | | | | fix apiServerArguments and controllerServerArgumentsJason DeTiberus2015-08-221-8/+2
|/ / / / / /
| | | | | * Merge remote-tracking branch 'openshift/master'Diego Castro2015-08-2260-93/+1387
| | |_|_|/| | |/| | |/ | | | |/| | | |/| | | |/| | | |/| | | |
* | | | | Merge pull request #500 from jim-minter/fix-etcd-ca-lifetimeBrenton Leanhardt2015-08-211-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make CA lifetime 365 days, not 30Jim Minter2015-08-211-0/+1
|/ / / /
* | | | Merge pull request #496 from kwoodson/zbxsetupMatt Woodson2015-08-202-4/+40
|\ \ \ \
| * | | | fixed zbx_user. Update password playbook addedKenny Woodson2015-08-202-4/+40
|/ / / /
* | | | Automatic commit of package [openshift-ansible-inventory] release [0.0.9-1].Kenny Woodson2015-08-202-2/+28
* | | | Automatic commit of package [openshift-ansible-bin] release [0.0.19-1].Kenny Woodson2015-08-202-2/+20
* | | | Merge pull request #495 from kwoodson/pvfix1Kenny Woodson2015-08-191-0/+10
|\ \ \ \
| * | | | Added tagging to the pv volumesKenny Woodson2015-08-191-0/+10
|/ / / /
* | | | Merge pull request #493 from kwoodson/pvfixKenny Woodson2015-08-191-0/+7
|\ \ \ \
| * | | | remove fstab entry after pv creationKenny Woodson2015-08-191-0/+7
|/ / / /
* | | | Merge pull request #491 from detiber/masterBrenton Leanhardt2015-08-181-1/+1
|\ \ \ \
| * | | | another kubelet_args fixJason DeTiberus2015-08-181-1/+1
* | | | | Merge pull request #490 from detiber/masterBrenton Leanhardt2015-08-181-2/+2
|\| | | |
| * | | | Fix kubelet_argsJason DeTiberus2015-08-181-2/+2
* | | | | Merge pull request #487 from detiber/bz1252337Brenton Leanhardt2015-08-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug 1252337 - Fix for quote error in oauthConfig templateJason DeTiberus2015-08-171-1/+1
| | |/ / | |/| |
* | | | Merge pull request #488 from kwoodson/zbxapiKenny Woodson2015-08-179-24/+761
|\ \ \ \
| * | | | UpdatesKenny Woodson2015-08-179-24/+761
* | | | | Merge pull request #444 from aveshagarwal/ae-ansible-merge-uninstallBrenton Leanhardt2015-08-171-0/+93
|\ \ \ \ \
| * | | | | Updated to include origin and atomic-openshift RPMs re-factoring toAvesh Agarwal2015-08-171-6/+31
| * | | | | Updated tutorial reset file and made following chages:Avesh Agarwal2015-08-171-2/+23
| * | | | | Renamed the file as it mainly applies to atomic enterprise.Avesh Agarwal2015-08-171-0/+0
| * | | | | Added /root/.kube to be deleted so that the stuff there does not preventAvesh Agarwal2015-08-171-0/+1
| * | | | | playbooks/adhoc: Add a tutorial-reset playbook to undo everythingColin Walters2015-08-171-0/+46
* | | | | | Merge pull request #468 from kwoodson/tempKenny Woodson2015-08-172-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated to show private ips when doing a listKenny Woodson2015-08-132-4/+4
* | | | | | Merge pull request #405 from sdodson/loglevel2Brenton Leanhardt2015-08-1712-15/+13
|\ \ \ \ \ \
| * | | | | | Set loglevel=2 as our default across the boardScott Dodson2015-07-2912-15/+13
* | | | | | | Merge pull request #408 from sdodson/docker-buildvmBrenton Leanhardt2015-08-172-4/+4
|\ \ \ \ \ \ \
| * | | | | | | docker-buildvm-rhose is deadScott Dodson2015-07-312-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #393 from detiber/bz1246458Brenton Leanhardt2015-08-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Bug 1246458 - dnsIP does not point to cluster IPJason DeTiberus2015-07-271-1/+1
* | | | | | | | 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