Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3703 from kwoodson/oc_group | Kenny Woodson | 2017-03-20 | 8 | -0/+2325 |
|\ | | | | | Adding oc_group to lib_openshift. | ||||
| * | Adding oc_group to lib_openshift | Kenny Woodson | 2017-03-20 | 8 | -0/+2325 |
| | | |||||
* | | Merge pull request #3708 from aweiteka/schema2 | OpenShift Bot | 2017-03-20 | 1 | -1/+1 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | acceptschema2 default: true | Aaron Weitekamp | 2017-03-20 | 1 | -1/+1 |
| |/ | | | | | | | Signed-off-by: Aaron Weitekamp <aweiteka@redhat.com> | ||||
* / | Do not require python-six via openshift_facts | Rodolfo Carvalho | 2017-03-20 | 2 | -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_projects | OpenShift Bot | 2017-03-17 | 6 | -66/+17 |
|\ | | | | | Merged by openshift-bot | ||||
| * | Moving projects task within openshift_hosted | Russell Teague | 2017-03-17 | 4 | -9/+17 |
| | | |||||
| * | Refactor openshift_projects role | Russell Teague | 2017-03-17 | 3 | -62/+5 |
| | | |||||
* | | Merge pull request #3695 from rhcarvalho/check-unit-tests | OpenShift Bot | 2017-03-17 | 3 | -1/+47 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | Add unit tests for existing health checks | Rodolfo Carvalho | 2017-03-17 | 3 | -1/+47 |
| | | | |||||
* | | | Merge pull request #3477 from lmello/fix-generate_jks.sh | OpenShift Bot | 2017-03-17 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Merged by openshift-bot | ||||
| * | | change shell to bash in generate_jks.sh | Leonardo Rodrigues de Mello | 2017-02-23 | 1 | -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_fix | OpenShift Bot | 2017-03-17 | 3 | -44/+222 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Do not update when properties when not passed. | Kenny Woodson | 2017-03-16 | 3 | -44/+222 |
| | | | | |||||
* | | | | enable docker excluder since the time it is installed | Jan Chaloupka | 2017-03-16 | 4 | -16/+16 |
| |_|/ |/| | | |||||
* | | | Merge pull request #3671 from abutcher/router-nodes | OpenShift Bot | 2017-03-16 | 1 | -3/+10 |
|\ \ \ | |/ / |/| | | Merged by openshift-bot | ||||
| * | | Fix get_router_replicas infrastructure node count. | Andrew Butcher | 2017-03-16 | 1 | -3/+10 |
| | | | |||||
* | | | Merge pull request #3683 from kwoodson/py35_scope_fix | Scott Dodson | 2017-03-16 | 21 | -63/+63 |
|\ \ \ | | | | | | | | | Fixing variable naming for 35 scoping. | ||||
| * | | | Fixing variable naming for 35 scoping. | Kenny Woodson | 2017-03-16 | 21 | -63/+63 |
| | | | | |||||
* | | | | Merge pull request #3674 from sdodson/fix-ovs-race | OpenShift Bot | 2017-03-16 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Fix containerized openvswitch race | Scott Dodson | 2017-03-15 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3669 from ewolinetz/logging_master_api_port | Scott Dodson | 2017-03-16 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Removing dependency on master facts for master_public_url default | ||||
| * | | | | Removing dependency on master facts for master_public_url default | ewolinetz | 2017-03-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3664 from ewolinetz/logging_cherrypick_3657 | OpenShift Bot | 2017-03-16 | 5 | -13/+16 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| * | | | | Merge branch 'master' into logging_cherrypick_3657 | Eric Wolinetz | 2017-03-15 | 9 | -16/+38 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Cherry picked from #3657 | ewolinetz | 2017-03-15 | 5 | -12/+17 |
| | | | | | |||||
* | | | | | Merge pull request #3673 from sdodson/remove-excluder-status | OpenShift Bot | 2017-03-16 | 3 | -90/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Since we've decided that we're no longer paying attention to current | Scott Dodson | 2017-03-15 | 3 | -90/+0 |
| | |/ / / | |/| | | | | | | | | | | | | | status remove this as it was toggling things | ||||
* | | | | | Merge pull request #3626 from mtnbikenc/module_rename | OpenShift Bot | 2017-03-15 | 8 | -25/+25 |
|\ \ \ \ \ | |/ / / / |/| | | | | Merged by openshift-bot | ||||
| * | | | | Renaming oadm_manage_node to oc_adm_manage_node | Russell Teague | 2017-03-10 | 8 | -25/+25 |
| | | | | | |||||
* | | | | | Merge pull request #3629 from ewolinetz/logging_15_cherrypick | OpenShift Bot | 2017-03-15 | 6 | -8/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| * | | | | cherry picking from #3621 #3614 #3627 | ewolinetz | 2017-03-10 | 6 | -8/+9 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | | |||||
* | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | Revert "Enable docker during installation and upgrade by default" | Steve Kuznetsov | 2017-03-14 | 4 | -16/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3599 from martineg/min_tls_version | OpenShift Bot | 2017-03-14 | 2 | -0/+27 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Allow overriding minTLSVersion and cipherSuites | Martin Eggen | 2017-03-09 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -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 installed | Jan Chaloupka | 2017-03-13 | 4 | -16/+16 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | 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 |