| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into logging_cherrypick_3657 | Eric Wolinetz | 2017-03-15 | 9 | -16/+38 |
| |\ | |||||
| | * | Merge pull request #3629 from ewolinetz/logging_15_cherrypick | OpenShift Bot | 2017-03-15 | 8 | -10/+11 |
| | |\ | | | | | | | Merged by openshift-bot | ||||
| | | * | cherry picking from #3621 #3614 #3627 | ewolinetz | 2017-03-10 | 8 | -10/+11 |
| | | | | |||||
| | * | | Merge pull request #3646 from vishpat/service-account | OpenShift Bot | 2017-03-15 | 2 | -0/+23 |
| | |\ \ | | | | | | | | | Merged by openshift-bot | ||||
| | | * | | Nuage service account handling by single master | Vishal Patil | 2017-03-14 | 2 | -0/+23 |
| | | | | | |||||
| | * | | | Merge pull request #3634 from kwoodson/raise_on_prep_failures | OpenShift Bot | 2017-03-15 | 2 | -8/+8 |
| | |\ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| | | * | | | Raise on dry-run failures. | Kenny Woodson | 2017-03-13 | 2 | -8/+8 |
| | | | | | | |||||
| * | | | | | Cherry picked from #3657 | ewolinetz | 2017-03-15 | 7 | -16/+21 |
| |/ / / / | |||||
| * | | | | Merge pull request #3650 from mtnbikenc/fix-router | OpenShift Bot | 2017-03-15 | 1 | -0/+9 |
| |\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | Add router svcacct cluster-reader role | Russell Teague | 2017-03-14 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Merge pull request #3658 from ↵ | Scott Dodson | 2017-03-14 | 5 | -23/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | openshift/revert-3620-enable-docker-during-installation-and-upgrade-by-default Revert "Enable docker during installation and upgrade by default" | ||||
| | * | | | | | Revert "Enable docker during installation and upgrade by default" | Steve Kuznetsov | 2017-03-14 | 5 | -23/+16 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #3599 from martineg/min_tls_version | OpenShift Bot | 2017-03-14 | 4 | -0/+45 |
| |\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | Allow overriding minTLSVersion and cipherSuites | Martin Eggen | 2017-03-09 | 4 | -0/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parameters to allow overriding minTLSVersion and cipherSuites in master and node servingInfo config stanzas. | ||||
| * | | | | | | Merge pull request #3620 from ↵ | Scott Dodson | 2017-03-14 | 5 | -16/+23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/enable-docker-during-installation-and-upgrade-by-default Enable docker during installation and upgrade by default | ||||
| | * | | | | | | enable docker excluder since the time it is installed | Jan Chaloupka | 2017-03-13 | 5 | -16/+23 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge pull request #3636 from obuisson/tlsv1.2 | OpenShift Bot | 2017-03-14 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Merged by openshift-bot | ||||
| | * | | | | | Force to use TLSv1.2 (related to ↵ | Olivier Buisson | 2017-03-13 | 2 | -2/+2 |
| | |/ / / / | | | | | | | | | | | | | | | | https://github.com/openshift/openshift-ansible/pull/2707) | ||||
| * | | | | | Merge pull request #3640 from mtnbikenc/refactor-serviceaccount | OpenShift Bot | 2017-03-13 | 7 | -104/+29 |
| |\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | Refactor and remove openshift_serviceaccount | Russell Teague | 2017-03-13 | 7 | -104/+29 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3641 from detiber/fixSixError | OpenShift Bot | 2017-03-13 | 2 | -1/+4 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| | * | | | | Revert module_utils six for openshift_health_checker | Jason DeTiberus | 2017-03-13 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Embedded version of six in Ansible 2.2.1 does not support add_metaclass, so revert to using python-six. | ||||
| * | | | | | Merge pull request #3645 from ewolinetz/openshift_logging_meta_fix | Scott Dodson | 2017-03-13 | 1 | -1/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Cherry picking from #3644 | ||||
| | * | | | | | Cherry picking from #3644 | ewolinetz | 2017-03-13 | 1 | -1/+0 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #3622 from kwoodson/remove_incorrect_files | OpenShift Bot | 2017-03-13 | 2 | -5163/+0 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Merged by openshift-bot | ||||
| | * | | | | Removed unused, unwanted, incorrectly committed code. | Kenny Woodson | 2017-03-10 | 2 | -5163/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #3631 from ingvagabund/validate-excluders-on-non-atomic-only | OpenShift Bot | 2017-03-13 | 1 | -13/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | validate excluders on non-atomic hosts only | Jan Chaloupka | 2017-03-13 | 1 | -13/+16 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #3637 from sdodson/typo | Scott Dodson | 2017-03-13 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fix typo | ||||
| | * | | | | Fix typo | Scott Dodson | 2017-03-13 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #3625 from jcantrill/bz1430661_update_metrics_url | OpenShift Bot | 2017-03-11 | 4 | -0/+45 |
| |\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | add 'hawkular/metrics' when updating config | Jeff Cantrill | 2017-03-10 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | update all the masters | Jeff Cantrill | 2017-03-10 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | bug 1430661. Update masterConfig metricsPublicURL on install | Jeff Cantrill | 2017-03-10 | 3 | -0/+37 |
| | | | | | | |||||
| * | | | | | Merge pull request #3623 from tbielawa/petset_early_fail_again | OpenShift Bot | 2017-03-10 | 1 | -2/+2 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| | * | | | | Fix incorrect comparison when detecting petsets | Tim Bielawa | 2017-03-10 | 1 | -2/+2 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #3596 from jcantrill/bz1428249_hostmount_fix | OpenShift Bot | 2017-03-10 | 6 | -11/+26 |
| |\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | bug 1428249. Use ES hostmount storage if it exists | Jeff Cantrill | 2017-03-09 | 6 | -11/+26 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #3610 from ↵ | Scott Dodson | 2017-03-10 | 3 | -0/+14 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ingvagabund/re-enable-excluders-during-installation-if-enabled re-enable excluders if they are enabled after openshift version detection | ||||
| | * | | | | re-enable excluders if they are enabled after openshift version detection | Jan Chaloupka | 2017-03-09 | 3 | -0/+14 |
| | | | | | | |||||
| * | | | | | Merge pull request #3615 from ashcrow/nuage-3583 | OpenShift Bot | 2017-03-10 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| | * | | | | | nuage: Move role back to config | Steve Milner | 2017-03-10 | 2 | -2/+2 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d113f03 moved role dependencies out of playbooks. However, this ended up causing the masters to not be configured before the nuage steps required configured masters. This change moves the nuage specific change in d113f03 back to the config. Resolves #3583 | ||||
| * | | | | | Merge pull request #3624 from codificat/fix-readme-container | Scott Dodson | 2017-03-10 | 1 | -7/+7 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Minor updates to README_CONTAINER_IMAGE.md | ||||
| | * | | | | Minor updates to README_CONTAINER_IMAGE.md | Pep Turró Mauri | 2017-03-10 | 1 | -7/+7 |
| | |/ / / | | | | | | | | | | | | | Fix link to the example role, prefix image name with openshift/. | ||||
| * | | | | Merge pull request #3616 from richm/missing-searchguard.truststore | OpenShift Bot | 2017-03-10 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| | * | | | Bug 1428711 - [IntService_public_324] ES pod is unable to read ↵ | Rich Megginson | 2017-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searchguard.truststore after upgarde logging from 3.3.1 to 3.5.0 https://bugzilla.redhat.com/show_bug.cgi?id=1428711 The list of secrets for elasticsearch was missing searchguard.truststore | ||||
| * | | | | Merge pull request #3618 from germansosa/master | Scott Dodson | 2017-03-10 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix references to openshift_set_node_ip in inventory examples | ||||
| | * | | | | Fix references to openshift_set_node_ip in inventory examples | germansosa | 2017-03-10 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #3613 from detiber/module_utils_six | OpenShift Bot | 2017-03-10 | 6 | -31/+33 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Merged by openshift-bot | ||||
| | * | | | | Use ansible.compat.six where possible | Jason DeTiberus | 2017-03-09 | 4 | -26/+30 |
| | | | | | | |||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |