Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #491 from detiber/master | Brenton Leanhardt | 2015-08-18 | 1 | -1/+1 |
|\ | | | | | another kubelet_args fix | ||||
| * | another kubelet_args fix | Jason DeTiberus | 2015-08-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #490 from detiber/master | Brenton Leanhardt | 2015-08-18 | 1 | -2/+2 |
|\| | | | | | Fix kubelet_args | ||||
| * | Fix kubelet_args | Jason DeTiberus | 2015-08-18 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #487 from detiber/bz1252337 | Brenton Leanhardt | 2015-08-18 | 1 | -1/+1 |
|\ \ | |/ |/| | Bug 1252337 - Fix for quote error in oauthConfig template | ||||
| * | Bug 1252337 - Fix for quote error in oauthConfig template | Jason DeTiberus | 2015-08-17 | 1 | -1/+1 |
| | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1252337 | ||||
* | | Merge pull request #488 from kwoodson/zbxapi | Kenny Woodson | 2015-08-17 | 9 | -24/+761 |
|\ \ | | | | | | | Zabbix API updates | ||||
| * | | Updates | Kenny Woodson | 2015-08-17 | 9 | -24/+761 |
| | | | |||||
* | | | Merge pull request #444 from aveshagarwal/ae-ansible-merge-uninstall | Brenton Leanhardt | 2015-08-17 | 1 | -0/+93 |
|\ \ \ | | | | | | | | | AE->OSO ansible uninstall merge | ||||
| * | | | Updated to include origin and atomic-openshift RPMs re-factoring to | Avesh Agarwal | 2015-08-17 | 1 | -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 Agarwal | 2015-08-17 | 1 | -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 Agarwal | 2015-08-17 | 1 | -0/+0 |
| | | | | |||||
| * | | | Added /root/.kube to be deleted so that the stuff there does not prevent | Avesh Agarwal | 2015-08-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | a new install. | ||||
| * | | | playbooks/adhoc: Add a tutorial-reset playbook to undo everything | Colin Walters | 2015-08-17 | 1 | -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/temp | Kenny Woodson | 2015-08-17 | 2 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | List also private ip. | ||||
| * | | | Updated to show private ips when doing a list | Kenny Woodson | 2015-08-13 | 2 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #405 from sdodson/loglevel2 | Brenton Leanhardt | 2015-08-17 | 12 | -15/+13 |
|\ \ \ \ | | | | | | | | | | | Set loglevel=2 as our default across the board | ||||
| * | | | | Set loglevel=2 as our default across the board | Scott Dodson | 2015-07-29 | 12 | -15/+13 |
| | | | | | |||||
* | | | | | Merge pull request #408 from sdodson/docker-buildvm | Brenton Leanhardt | 2015-08-17 | 2 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | docker-buildvm-rhose is dead | ||||
| * | | | | | docker-buildvm-rhose is dead | Scott Dodson | 2015-07-31 | 2 | -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/bz1246458 | Brenton Leanhardt | 2015-08-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Bug 1246458 - dnsIP does not point to cluster IP | ||||
| * | | | | | Bug 1246458 - dnsIP does not point to cluster IP | Jason DeTiberus | 2015-07-27 | 1 | -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-guide | Brenton Leanhardt | 2015-08-17 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add links to style guide, best practices in README.md | ||||
| * | | | | | | Add links to style guide, best practices in README.md | Scott Dodson | 2015-06-17 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #410 from codificat/rhel-repos | Brenton Leanhardt | 2015-08-17 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fine tune RHEL repos | ||||
| * | | | | | | | Remove the 'optional' repository | Pep Turró Mauri | 2015-08-12 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Fine tune RHEL repos | Pep Turró Mauri | 2015-08-02 | 1 | -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-container | Brenton Leanhardt | 2015-08-17 | 2 | -0/+32 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | AE->OSO ansible merge: ansible in container | ||||
| * | | | | | | | Updated Dockerfile not to clone openshift-ansible repo. | Avesh Agarwal | 2015-08-14 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Movied Dockerfile to openshift-ansible repo root and updated README_ANSIBLE_CONTAINER.md file. | ||||
| * | | | | | | | Removed white spaces. | Avesh Agarwal | 2015-08-14 | 1 | -4/+1 |
| | | | | | | | | |||||
| * | | | | | | | Renamed README_ANSIBLE to README_ANSIBLE_CONTAINER as per feedback. | Avesh Agarwal | 2015-08-14 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Added README_ANSIBLE.md file that contains instructions to build and run | Avesh Agarwal | 2015-08-14 | 2 | -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 and | Avesh Agarwal | 2015-08-14 | 1 | -10/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also added privileged flag to allow sharing host network and host dirs. | ||||
| * | | | | | | | add RHEL7 Dockerfile | Aaron Weitekamp | 2015-08-14 | 1 | -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-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 |