summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into logging_cherrypick_3657Eric Wolinetz2017-03-159-16/+38
|\
| * Merge pull request #3629 from ewolinetz/logging_15_cherrypickOpenShift Bot2017-03-156-8/+9
| |\
| | * cherry picking from #3621 #3614 #3627ewolinetz2017-03-106-8/+9
| * | Merge pull request #3646 from vishpat/service-accountOpenShift Bot2017-03-152-0/+23
| |\ \
| | * | Nuage service account handling by single masterVishal Patil2017-03-142-0/+23
| * | | Merge pull request #3634 from kwoodson/raise_on_prep_failuresOpenShift Bot2017-03-152-8/+8
| |\ \ \
| | * | | Raise on dry-run failures.Kenny Woodson2017-03-132-8/+8
* | | | | Cherry picked from #3657ewolinetz2017-03-155-12/+17
|/ / / /
* | | | Merge pull request #3650 from mtnbikenc/fix-routerOpenShift Bot2017-03-151-0/+9
|\ \ \ \
| * | | | Add router svcacct cluster-reader roleRussell Teague2017-03-141-0/+9
* | | | | Revert "Enable docker during installation and upgrade by default"Steve Kuznetsov2017-03-144-16/+16
* | | | | Merge pull request #3599 from martineg/min_tls_versionOpenShift Bot2017-03-142-0/+27
|\ \ \ \ \
| * | | | | Allow overriding minTLSVersion and cipherSuitesMartin Eggen2017-03-092-0/+27
* | | | | | Merge pull request #3620 from ingvagabund/enable-docker-during-installation-a...Scott Dodson2017-03-144-16/+16
|\ \ \ \ \ \
| * | | | | | enable docker excluder since the time it is installedJan Chaloupka2017-03-134-16/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3636 from obuisson/tlsv1.2OpenShift Bot2017-03-142-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Force to use TLSv1.2 (related to https://github.com/openshift/openshift-ansib...Olivier Buisson2017-03-132-2/+2
| |/ / / /
* | | | | Merge pull request #3640 from mtnbikenc/refactor-serviceaccountOpenShift Bot2017-03-137-104/+29
|\ \ \ \ \
| * | | | | Refactor and remove openshift_serviceaccountRussell Teague2017-03-137-104/+29
| |/ / / /
* | | | | Merge pull request #3641 from detiber/fixSixErrorOpenShift Bot2017-03-132-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Revert module_utils six for openshift_health_checkerJason DeTiberus2017-03-132-1/+4
| |/ / /
* | | | Merge pull request #3645 from ewolinetz/openshift_logging_meta_fixScott Dodson2017-03-131-1/+0
|\ \ \ \
| * | | | Cherry picking from #3644ewolinetz2017-03-131-1/+0
| | |_|/ | |/| |
* | | | Merge pull request #3622 from kwoodson/remove_incorrect_filesOpenShift Bot2017-03-132-5163/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Removed unused, unwanted, incorrectly committed code.Kenny Woodson2017-03-102-5163/+0
* | | | Merge pull request #3625 from jcantrill/bz1430661_update_metrics_urlOpenShift Bot2017-03-113-0/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | add 'hawkular/metrics' when updating configJeff Cantrill2017-03-101-1/+1
| * | | bug 1430661. Update masterConfig metricsPublicURL on installJeff Cantrill2017-03-103-0/+37
* | | | Merge pull request #3596 from jcantrill/bz1428249_hostmount_fixOpenShift Bot2017-03-106-11/+26
|\ \ \ \
| * | | | bug 1428249. Use ES hostmount storage if it existsJeff Cantrill2017-03-096-11/+26
| | |_|/ | |/| |
* | | | Merge pull request #3615 from ashcrow/nuage-3583OpenShift Bot2017-03-101-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | nuage: Move role back to configSteve Milner2017-03-101-2/+0
| | |/ | |/|
* | | Merge pull request #3616 from richm/missing-searchguard.truststoreOpenShift Bot2017-03-101-1/+1
|\ \ \ | |/ / |/| |
| * | Bug 1428711 - [IntService_public_324] ES pod is unable to read searchguard.tr...Rich Megginson2017-03-091-1/+1
* | | Merge pull request #3613 from detiber/module_utils_sixOpenShift Bot2017-03-105-10/+16
|\ \ \
| * | | Use ansible.compat.six where possibleJason DeTiberus2017-03-093-5/+13
| * | | Use six from ansible.module_utils for remote hostsJason DeTiberus2017-03-094-7/+5
* | | | Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067OpenShift Bot2017-03-093-1/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove debug taskTim Bielawa2017-03-091-3/+0
| * | | New roleTim Bielawa2017-03-083-1/+22
* | | | Merge pull request #3605 from kwoodson/oc_adm_policy_user_fixOpenShift Bot2017-03-096-54/+5319
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixing the way policies are found. The old method was unreliable. This meth...Kenny Woodson2017-03-086-54/+5319
| |/ /
* | | Merge pull request #3590 from kwoodson/router_registry_unit_testsAndrew Butcher2017-03-0925-50/+914
|\ \ \
| * | | Removing ordereddict. Replaced with sorted keys.Kenny Woodson2017-03-0826-95/+97
| * | | Fixed for linting.Kenny Woodson2017-03-082-5/+1
| * | | Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test ...Kenny Woodson2017-03-0726-115/+420
| * | | Adding test_oc_adm_router.Kenny Woodson2017-03-071-0/+476
| * | | Adding router test.Kenny Woodson2017-03-071-0/+85
* | | | Merge pull request #3586 from srampal/issue3541Scott Dodson2017-03-094-1/+36
|\ \ \ \
| * | | | Fix for issue 3541Sanjeev Rampal2017-03-074-1/+36