summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #491 from detiber/masterBrenton Leanhardt2015-08-181-1/+1
|\ | | | | another kubelet_args fix
| * another kubelet_args fixJason DeTiberus2015-08-181-1/+1
| |
* | Merge pull request #490 from detiber/masterBrenton Leanhardt2015-08-181-2/+2
|\| | | | | Fix kubelet_args
| * 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 template
| * Bug 1252337 - Fix for quote error in oauthConfig templateJason DeTiberus2015-08-171-1/+1
| | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1252337
* | Merge pull request #488 from kwoodson/zbxapiKenny Woodson2015-08-179-24/+761
|\ \ | | | | | | Zabbix API updates
| * | UpdatesKenny Woodson2015-08-179-24/+761
| | |
* | | Merge pull request #444 from aveshagarwal/ae-ansible-merge-uninstallBrenton Leanhardt2015-08-171-0/+93
|\ \ \ | | | | | | | | AE->OSO ansible uninstall merge
| * | | Updated to include origin and atomic-openshift RPMs re-factoring toAvesh Agarwal2015-08-171-6/+31
| | | | | | | | | | | | | | | | | | | | include all origin, AE and openshift products. For back-word compatibility, older openshift and AE naming is retained too.
| * | | Updated tutorial reset file and made following chages:Avesh Agarwal2015-08-171-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Included openshift clean up 2. Renamed file to atomic_openshift_tutorial_reset.yml 3. docker service is not not stopped 4. docker containers and images are removed 5. /etc/openshift-sdn are removed too now
| * | | 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
| | | | | | | | | | | | | | | | a new install.
| * | | playbooks/adhoc: Add a tutorial-reset playbook to undo everythingColin Walters2015-08-171-0/+46
| | | | | | | | | | | | | | | | | | | | This makes it easier to run through the tutorial, as well as reset a VM or baremetal node to a clean slate for developer testing.
* | | | Merge pull request #468 from kwoodson/tempKenny Woodson2015-08-172-4/+4
|\ \ \ \ | |/ / / |/| | | List also private ip.
| * | | 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 board
| * | | | 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 dead
| * | | | | docker-buildvm-rhose is deadScott Dodson2015-07-312-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Both the original and the new hosts are both internal hosts used only for testing of un-released content. One should not expect to use these outside of Red Hat.
* | | | | Merge pull request #393 from detiber/bz1246458Brenton Leanhardt2015-08-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bug 1246458 - dnsIP does not point to cluster IP
| * | | | | Bug 1246458 - dnsIP does not point to cluster IPJason DeTiberus2015-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1246458 - Previously when configuring an HA cluster for multi-master the dns ip in the node config was pointing only to the first master instead of the cluster ip.
* | | | | | Merge pull request #286 from sdodson/contrib-guideBrenton Leanhardt2015-08-171-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add links to style guide, best practices in README.md
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fine tune RHEL repos
| * | | | | | | Remove the 'optional' repositoryPep Turró Mauri2015-08-121-1/+0
| | | | | | | |
| * | | | | | | Fine tune RHEL reposPep Turró Mauri2015-08-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable all repos before explicitly enabling the expected ones: sometimes active repos might be polluted (e.g. depending on the result of rhsm auto-attach). Enable Extras and Optional repos.
* | | | | | | | Merge pull request #456 from aveshagarwal/ae-ansible-merge-containerBrenton Leanhardt2015-08-172-0/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | AE->OSO ansible merge: ansible in container
| * | | | | | | Updated Dockerfile not to clone openshift-ansible repo.Avesh Agarwal2015-08-142-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Movied Dockerfile to openshift-ansible repo root and updated README_ANSIBLE_CONTAINER.md file.
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ansible in a docker container, and also modified Dockerfile to replace CMD with ENTRYPOINT to run the container as executable.
| * | | | | | | Changes to Dockerfile to make it work with openshift-ansible andAvesh Agarwal2015-08-141-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also added privileged flag to allow sharing host network and host dirs.
| * | | | | | | add RHEL7 DockerfileAaron Weitekamp2015-08-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This Dockerfile packages ansible and the playbook as a container image. It's a proof of concept as it makes some assumptions: - bindmounts private key ~/.ssh/id_rsa - default cmd executes the byo playbook
* | | | | | | | 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