summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3708 from aweiteka/schema2OpenShift Bot2017-03-201-1/+1
|\ | | | | Merged by openshift-bot
| * acceptschema2 default: trueAaron Weitekamp2017-03-201-1/+1
| | | | | | | | Signed-off-by: Aaron Weitekamp <aweiteka@redhat.com>
* | Do not require python-six via openshift_factsRodolfo Carvalho2017-03-202-7/+3
|/ | | | | | | | | | | | | It turns out the code in roles/openshift_health_checker/openshift_checks/__init__.py had a mistake in the import statement, and not the case that `add_metaclass` is not available in the embedded `six` from `ansible.module_utils`. The fix is to correct the import and do not require python-six to be installed on target hosts. Note: now that we have some unit tests in the role, errors like that would have been caught.
* Merge pull request #3656 from mtnbikenc/refactor-openshift_projectsOpenShift Bot2017-03-176-66/+17
|\ | | | | Merged by openshift-bot
| * Moving projects task within openshift_hostedRussell Teague2017-03-174-9/+17
| |
| * Refactor openshift_projects roleRussell Teague2017-03-173-62/+5
| |
* | Merge pull request #3695 from rhcarvalho/check-unit-testsOpenShift Bot2017-03-173-1/+47
|\ \ | | | | | | Merged by openshift-bot
| * | Add unit tests for existing health checksRodolfo Carvalho2017-03-173-1/+47
| | |
* | | Merge pull request #3477 from lmello/fix-generate_jks.shOpenShift Bot2017-03-171-1/+1
|\ \ \ | |_|/ |/| | Merged by openshift-bot
| * | change shell to bash in generate_jks.shLeonardo Rodrigues de Mello2017-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generate_jks.sh script uses non-posix standard shell features, this breaks the openshift_logging installation if the controller node is running debian or ubuntu. This problem was not spot before because probably all the developers use fedora or redhat/centos and in redhat based distributions the /bin/sh is a symlink to bash. Debian and ubuntu adopted dash a long time ago and in debian/ubuntu controller nodes /bin/sh is a symlink to dash, that does not support the extended feature set required by this script. This commit changes the shell to bash to ensure it is run with a shell interpreter that supports the extended feature. https://www.shellcheck.net/ https://wiki.ubuntu.com/DashAsBinSh
* | | Merge pull request #3654 from kwoodson/project_fixOpenShift Bot2017-03-173-44/+222
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Do not update when properties when not passed.Kenny Woodson2017-03-163-44/+222
| | | |
* | | | enable docker excluder since the time it is installedJan Chaloupka2017-03-164-16/+16
| |_|/ |/| |
* | | Merge pull request #3671 from abutcher/router-nodesOpenShift Bot2017-03-161-3/+10
|\ \ \ | |/ / |/| | Merged by openshift-bot
| * | Fix get_router_replicas infrastructure node count.Andrew Butcher2017-03-161-3/+10
| | |
* | | Merge pull request #3683 from kwoodson/py35_scope_fixScott Dodson2017-03-1621-63/+63
|\ \ \ | | | | | | | | Fixing variable naming for 35 scoping.
| * | | Fixing variable naming for 35 scoping.Kenny Woodson2017-03-1621-63/+63
| | | |
* | | | Merge pull request #3674 from sdodson/fix-ovs-raceOpenShift Bot2017-03-161-0/+2
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix containerized openvswitch raceScott Dodson2017-03-151-0/+2
| | |/ / | |/| |
* | | | Merge pull request #3669 from ewolinetz/logging_master_api_portScott Dodson2017-03-161-1/+1
|\ \ \ \ | | | | | | | | | | Removing dependency on master facts for master_public_url default
| * | | | Removing dependency on master facts for master_public_url defaultewolinetz2017-03-151-1/+1
| | | | |
* | | | | Merge pull request #3664 from ewolinetz/logging_cherrypick_3657OpenShift Bot2017-03-165-13/+16
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | Merge branch 'master' into logging_cherrypick_3657Eric Wolinetz2017-03-159-16/+38
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Cherry picked from #3657ewolinetz2017-03-155-12/+17
| | | | |
* | | | | Merge pull request #3673 from sdodson/remove-excluder-statusOpenShift Bot2017-03-163-90/+0
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Since we've decided that we're no longer paying attention to currentScott Dodson2017-03-153-90/+0
| | |/ / / | |/| | | | | | | | | | | | | status remove this as it was toggling things
* | | | | Merge pull request #3626 from mtnbikenc/module_renameOpenShift Bot2017-03-158-25/+25
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | Renaming oadm_manage_node to oc_adm_manage_nodeRussell Teague2017-03-108-25/+25
| | | | |
* | | | | Merge pull request #3629 from ewolinetz/logging_15_cherrypickOpenShift Bot2017-03-156-8/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | cherry picking from #3621 #3614 #3627ewolinetz2017-03-106-8/+9
| | | | |
* | | | | 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
| | | | | | |
* | | | | | | 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