summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | Merged by openshift-bot
| * Allow overriding minTLSVersion and cipherSuitesMartin Eggen2017-03-092-0/+27
| | | | | | | | | | Add parameters to allow overriding minTLSVersion and cipherSuites in master and node servingInfo config stanzas.
* | Merge pull request #3620 from ↵Scott Dodson2017-03-144-16/+16
|\ \ | | | | | | | | | | | | 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 installedJan Chaloupka2017-03-134-16/+16
| | |
* | | Merge pull request #3636 from obuisson/tlsv1.2OpenShift Bot2017-03-142-2/+2
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Force to use TLSv1.2 (related to ↵Olivier Buisson2017-03-132-2/+2
| |/ / | | | | | | | | | https://github.com/openshift/openshift-ansible/pull/2707)
* | | Merge pull request #3640 from mtnbikenc/refactor-serviceaccountOpenShift Bot2017-03-137-104/+29
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Refactor and remove openshift_serviceaccountRussell Teague2017-03-137-104/+29
| |/ /
* | | Merge pull request #3641 from detiber/fixSixErrorOpenShift Bot2017-03-132-1/+4
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Revert module_utils six for openshift_health_checkerJason DeTiberus2017-03-132-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_fixScott Dodson2017-03-131-1/+0
|\ \ \ | | | | | | | | Cherry picking from #3644
| * | | Cherry picking from #3644ewolinetz2017-03-131-1/+0
| | | |
* | | | Merge pull request #3622 from kwoodson/remove_incorrect_filesOpenShift Bot2017-03-132-5163/+0
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | 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
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | nuage: Move role back to configSteve Milner2017-03-101-2/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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 #3616 from richm/missing-searchguard.truststoreOpenShift Bot2017-03-101-1/+1
|\ \ \ | |/ / |/| | Merged by openshift-bot
| * | Bug 1428711 - [IntService_public_324] ES pod is unable to read ↵Rich Megginson2017-03-091-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 #3613 from detiber/module_utils_sixOpenShift Bot2017-03-105-10/+16
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | Fixing the way policies are found. The old method was unreliable. This ↵Kenny Woodson2017-03-086-54/+5319
| |/ / | | | | | | | | | method searches all and matches on properties.
* | | Merge pull request #3590 from kwoodson/router_registry_unit_testsAndrew Butcher2017-03-0925-50/+914
|\ \ \ | | | | | | | | Fix to OpenshiftCLIConfig to support an sorted keys. Removed redundant get.
| * | | 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
| | | | | | | | | | | | | | | | cases.
| * | | 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 3541
| * | | | Fix for issue 3541Sanjeev Rampal2017-03-074-1/+36
| | | | |
* | | | | extend the excluders to containerized deploymentJan Chaloupka2017-03-096-6/+6
| | | | |
* | | | | Merge pull request #3604 from sdodson/issue3603Scott Dodson2017-03-081-0/+1
|\ \ \ \ \ | | | | | | | | | | | | openshift_excluders depends on openshift_repos
| * | | | | openshift_excluders depends on openshift_reposScott Dodson2017-03-081-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | So that centos repos are provisioned before attempting to install the excluders
* | | | | Merge pull request #3601 from mmckinst/etcd_versionOpenShift Bot2017-03-083-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | add ability to specify an etcd versionMark McKinstry2017-03-083-3/+3
| | |_|/ | |/| |
* / | | enable excluders by defaultJan Chaloupka2017-03-082-2/+4
|/ / /
* | | ignore the docker excluder status if it is not enabled by a userJan Chaloupka2017-03-081-0/+1
| | |
* | | Fix pylint/pyflakes errors on masterScott Dodson2017-03-072-3/+4
| | |
* | | Merge pull request #3558 from ewolinetz/logging_metrics_defaultsScott Dodson2017-03-0710-24/+52
|\ \ \ | | | | | | | | Adding some more logging and metrics defaults
| * | | More logging fixesewolinetz2017-03-074-8/+4
| | | |