summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #734 from ejemba/masterBrenton Leanhardt2015-10-261-2/+6
|\ | | | | Adding Docker Log Options capabilities
| * Adding Docker Log Options capabilitiesejemba2015-10-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | In regard of issue https://github.com/openshift/openshift-ansible/issues/696 added options (docker_log_dirver and docker_log_options) to bin/cluster: bin/cluster -o docker_log_driver=json-file -o docker_log_options="max-size=5m,max-files=5" will be added to OPTION in /etc/sysconfig/docker in all nodes of the cluster: "--log-driver json-file --log-opt max-size=5m --log-opt max-files=5"
* | Merge pull request #729 from detiber/handlerRefactorBrenton Leanhardt2015-10-264-7/+6
|\ \ | |/ |/| Avoid hardcoded 30s pauses
| * cleanup naming for skipping master and node restart handlersJason DeTiberus2015-10-234-4/+4
| |
| * Avoid hardcoded 30s pausesJason DeTiberus2015-10-224-7/+6
| | | | | | | | - refactor node and master restart handlers to avoid 30s pauses
* | Merge pull request #730 from detiber/rpmGenBrenton Leanhardt2015-10-221-14/+0
|\ \ | | | | | | Fix test and workaround for rpm generated configs
| * | Fix test and workaround for rpm generated configsJason DeTiberus2015-10-221-14/+0
| |/ | | | | | | | | | | - fixed inconcistency in naming for rpm generated config test - refactoring to fix logic after the ha master refactoring had broken the previous steps
* | Merge pull request #727 from detiber/fixFactsBrenton Leanhardt2015-10-221-1/+1
|\ \ | | | | | | Fix error in openshift_facts
| * | Fix error in openshift_factsJason DeTiberus2015-10-221-1/+1
| |/ | | | | | | - fix error scraping openshift version for version numbers
* | Merge pull request #736 from joelddiaz/cpu_no_pageJoel Diaz2015-10-221-1/+1
|\ \ | | | | | | Lower priority to stop the paging action.
| * | Lower priority to stop the paging action.Joel Diaz2015-10-221-1/+1
| |/
* | Merge pull request #728 from sdodson/fix-examplesBrenton Leanhardt2015-10-221-1/+1
|\ \ | |/ |/| Fix openshift_examples
| * Fix openshift_examplesScott Dodson2015-10-221-1/+1
| |
* | Merge pull request #721 from abutcher/fix-routerBrenton Leanhardt2015-10-221-1/+1
|\ \ | | | | | | Conditionally include openshift_router role
| * | Conditionally include openshift_router role.Andrew Butcher2015-10-221-1/+1
| | |
* | | Merge pull request #723 from mfojtik/patch-1Brenton Leanhardt2015-10-221-1/+1
|\ \ \ | |_|/ |/| | Update examples-sync.sh
| * | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| | |
| * | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| |/ | | | | Fixes: https://github.com/openshift/openshift-ansible/issues/722
* | Merge pull request #678 from sdodson/examplesWesley Hearn2015-10-222-5/+5
|\ \ | | | | | | Adjust the logic as to when examples are deployed
| * | Add match online imagestream/template loading to enterpriseScott Dodson2015-10-201-3/+3
| | |
| * | Adjust the logic as to when examples are deployedScott Dodson2015-10-202-5/+5
| | |
* | | Remove pylint comment from Sha-Bang. SSH process get hung when calling ↵Francisco Gimeno2015-10-211-1/+2
| |/ |/| | | | | python # pylint: disable=too-many-lines
* | Merge pull request #571 from dak1n1/routerWesley Hearn2015-10-214-9/+45
|\ \ | | | | | | Support HA or single router. Deploy after service accounts are created
| * | Support HA or single router, and start work on registryStefanie Forrester2015-10-214-9/+45
| | |
* | | Merge pull request #715 from kwoodson/zabbKenny Woodson2015-10-213-0/+5
|\ \ \ | | | | | | | | Adding delta to zbx_item
| * | | Adding delta feature to zbx_itemKenny Woodson2015-10-203-0/+5
| | | |
* | | | Merge pull request #704 from sdodson/sdn-iptablesBrenton Leanhardt2015-10-211-0/+3
|\ \ \ \ | |_|/ / |/| | | Add UDP 4789 firewall rule when using the SDN
| * | | Open 4789/udp when using the SDNScott Dodson2015-10-191-0/+3
| | | |
* | | | Merge pull request #714 from kwoodson/zabbKenny Woodson2015-10-204-32/+38
|\ \ \ \ | | |/ / | |/| | Adding zabbix agent bits zabbix-server
| * | | Zabbix server stat fixes. enable the proper item types.Kenny Woodson2015-10-204-32/+38
| | | |
* | | | Fix yaml indentation from use_openshift_sdn conditionalAndrew Butcher2015-10-201-2/+2
| | | |
* | | | Merge pull request #529 from sdodson/cockpit-masterWesley Hearn2015-10-203-0/+36
|\ \ \ \ | |/ / / |/| | | Add cockpit role
| * | | Add cockpit-ws with cockpit-kubernetes pluginScott Dodson2015-08-283-0/+36
| | | |
* | | | Merge pull request #589 from sdodson/issue585Brenton Leanhardt2015-10-201-2/+6
|\ \ \ \ | |_|_|/ |/| | | Lookup ansible_ssh_user group for kubeconfig perms
| * | | Lookup ansible_ssh_user group for kubeconfig permsScott Dodson2015-10-121-2/+6
| | | | | | | | | | | | | | | | Fixes #585
* | | | Allow disabling the network plugin configurationTomas Sedovic2015-10-202-0/+6
| |_|/ |/| | | | | | | | | | | | | | This is useful when we want to use a different networking solution without having any networking plugin code run when the services start up.
* | | Merge pull request #684 from gburges/gburges-projectcounterKenny Woodson2015-10-151-0/+10
|\ \ \ | | | | | | | | Update template_openshift_master.yml
| * | | Update template_openshift_master.ymlGabor Burges2015-10-111-0/+10
| | | |
* | | | Merge pull request #680 from liggitt/master_caBrenton Leanhardt2015-10-131-0/+1
|\ \ \ \ | | | | | | | | | | Add masterCA to oauth template
| * | | | Add masterCA to oauth templateJordan Liggitt2015-10-091-0/+1
| |/ / /
* | | | Merge pull request #687 from mwoodson/zabbizMatt Woodson2015-10-121-2/+20
|\ \ \ \ | | | | | | | | | | added the dynamic items to track free inodes
| * | | | added the dynamic items to track free inodesMatt Woodson2015-10-121-2/+20
| |/ / /
* | | | Merge pull request #658 from menren/gce-supportThomas Wiest2015-10-123-3/+3
|\ \ \ \ | |/ / / |/| | | GCE-support
| * | | fix : (node) labels defaults correctly to the variable openshift_node_labels ↵Chengcheng Mu2015-10-091-1/+1
| | | | | | | | | | | | | | | | when oo_option returns an empty list
| * | | Revert "Revert "GCE support""Chengcheng Mu2015-10-063-3/+3
| | | | | | | | | | | | | | | | This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b.
* | | | Raising limits to 90 and 85 for disk usageKenny Woodson2015-10-091-4/+4
| | | |
* | | | Merge pull request #635 from abutcher/bz1258243Brenton Leanhardt2015-10-092-4/+4
|\ \ \ \ | | | | | | | | | | Bug 1258243: Use lower() filter for node hostname
| * | | | Use lower() filter for node hostnameAndrew Butcher2015-10-082-4/+4
| |/ / /
* | | | Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-082-24/+26
|\ \ \ \ | | | | | | | | | | moved vswitch from master to node
| * | | | moved vswitch from master to nodeSten Turpin2015-10-082-24/+26
| | | | |