summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3666 from ↵OpenShift Bot2017-03-151-2/+6
|\ | | | | | | | | ingvagabund/dont-asume-openshift_upgrade_target-is-not-trivial Merged by openshift-bot
| * don't assume openshift_upgrade_target is in a form d.dJan Chaloupka2017-03-151-2/+6
| |
* | Merge pull request #3629 from ewolinetz/logging_15_cherrypickOpenShift Bot2017-03-158-10/+11
|\ \ | | | | | | Merged by openshift-bot
| * | cherry picking from #3621 #3614 #3627ewolinetz2017-03-108-10/+11
| | |
* | | Merge pull request #3646 from vishpat/service-accountOpenShift Bot2017-03-152-0/+23
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | Merged by openshift-bot
| * | | Raise on dry-run failures.Kenny Woodson2017-03-132-8/+8
| | | |
* | | | Merge pull request #3650 from mtnbikenc/fix-routerOpenShift Bot2017-03-151-0/+9
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Add router svcacct cluster-reader roleRussell Teague2017-03-141-0/+9
| | | | |
* | | | | Merge pull request #3658 from ↵Scott Dodson2017-03-145-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 Kuznetsov2017-03-145-23/+16
|/ / / / /
* | | | | Merge pull request #3599 from martineg/min_tls_versionOpenShift Bot2017-03-144-0/+45
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Allow overriding minTLSVersion and cipherSuitesMartin Eggen2017-03-094-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parameters to allow overriding minTLSVersion and cipherSuites in master and node servingInfo config stanzas.
* | | | | | Merge pull request #3620 from ↵Scott Dodson2017-03-145-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 installedJan Chaloupka2017-03-135-16/+23
| | |_|/ / / | |/| | | |
* | | | | | 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 #3631 from ingvagabund/validate-excluders-on-non-atomic-onlyOpenShift Bot2017-03-131-13/+16
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | validate excluders on non-atomic hosts onlyJan Chaloupka2017-03-131-13/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #3637 from sdodson/typoScott Dodson2017-03-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix typo
| * | | | Fix typoScott Dodson2017-03-131-1/+1
|/ / / /
* | | | Merge pull request #3625 from jcantrill/bz1430661_update_metrics_urlOpenShift Bot2017-03-114-0/+45
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | add 'hawkular/metrics' when updating configJeff Cantrill2017-03-101-1/+1
| | | | |
| * | | | update all the mastersJeff Cantrill2017-03-101-0/+8
| | | | |
| * | | | bug 1430661. Update masterConfig metricsPublicURL on installJeff Cantrill2017-03-103-0/+37
| | | | |
* | | | | Merge pull request #3623 from tbielawa/petset_early_fail_againOpenShift Bot2017-03-101-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | Fix incorrect comparison when detecting petsetsTim Bielawa2017-03-101-2/+2
| | |/ / | |/| |
* | | | 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 #3610 from ↵Scott Dodson2017-03-103-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 detectionJan Chaloupka2017-03-093-0/+14
| | | | |
* | | | | Merge pull request #3615 from ashcrow/nuage-3583OpenShift Bot2017-03-102-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | nuage: Move role back to configSteve Milner2017-03-102-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-containerScott Dodson2017-03-101-7/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | Minor updates to README_CONTAINER_IMAGE.md
| * | | | Minor updates to README_CONTAINER_IMAGE.mdPep Turró Mauri2017-03-101-7/+7
| |/ / / | | | | | | | | | | | | Fix link to the example role, prefix image name with openshift/.
* | | | 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 #3618 from germansosa/masterScott Dodson2017-03-102-2/+2
|\ \ \ \ | | | | | | | | | | Fix references to openshift_set_node_ip in inventory examples
| * | | | Fix references to openshift_set_node_ip in inventory examplesgermansosa2017-03-102-2/+2
| | | | |
* | | | | Merge pull request #3613 from detiber/module_utils_sixOpenShift Bot2017-03-106-31/+33
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | Use ansible.compat.six where possibleJason DeTiberus2017-03-094-26/+30
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 13:10:00 +0000