Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3548 from jcantrill/bz_1420256_again_reset_pvc_facts | Scott Dodson | 2017-03-02 | 2 | -18/+23 |
|\ | | | | | bug 1420256. Initialize openshift_logging pvc_facts to empty | ||||
| * | bug 1420256. Initialize openshift_logging pvc_facts to empty | Jeff Cantrill | 2017-03-02 | 2 | -18/+23 |
| | | |||||
* | | Merge pull request #3538 from mtnbikenc/bugfix-hosted-registry | Scott Dodson | 2017-03-02 | 1 | -1/+9 |
|\ \ | | | | | | | Correct config for hosted registry | ||||
| * | | Add oc_adm_policy_user task cluster-role policy | Russell Teague | 2017-03-02 | 1 | -0/+7 |
| | | | |||||
| * | | Correct config for hosted registry | Russell Teague | 2017-03-02 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #3547 from jupierce/oadm_policy_group_patch | Scott Dodson | 2017-03-02 | 4 | -4/+4 |
|\ \ | | | | | | | Fixing checkout for bindings with -binding suffix | ||||
| * | | Fixing checkout for bindings with -binding suffix | jupierce | 2017-03-02 | 4 | -4/+4 |
| | | | |||||
* | | | Merge pull request #3449 from detiber/hacky_cert_parsing | Jason DeTiberus | 2017-03-02 | 9 | -352/+293 |
|\ \ \ | |/ / |/| | | [wip] test fixes for openshift_certificates_expiry | ||||
| * | | test fixes for openshift_certificates_expiry | Jason DeTiberus | 2017-03-02 | 9 | -352/+293 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - create pytest fixtures for building certs at runtime - update tests to use the fixtures - add tests for load_and_handle_cert - fix py2/py3 encode/decode issues raised by tests - add get_extension_count method to fakeOpenSSLCertificate - avoid using a temp file for passing ssl certificate to openssl subprocess - other test tweaks: - exclude conftest.py and tests from coverage report - reduce the fail_under to 26%, since the tests being included were inflating our coverage | ||||
* | | | Merge pull request #3546 from sdodson/contiv-role-removal | Scott Dodson | 2017-03-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Leave an empty contiv role directory | ||||
| * | | | Leave an empty contiv role directory | Scott Dodson | 2017-03-02 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3534 from jupierce/oadm_policy_group | Scott Dodson | 2017-03-02 | 10 | -0/+5030 |
|\ \ \ | |/ / |/| | | oadm_policy_group/adm_policy_user module | ||||
| * | | oadm_policy_group/adm_policy_user module | jupierce | 2017-03-02 | 10 | -0/+5030 |
|/ / | |||||
* | | Merge pull request #3475 from ashcrow/1425583 | Tim Bielawa | 2017-03-02 | 1 | -0/+19 |
|\ \ | |/ |/| | Fails Installation If Docker Version is Too Old On Atomic Host | ||||
| * | Fail on Atomic if docker is too old | Steve Milner | 2017-03-02 | 1 | -0/+19 |
| | | | | | | | | | | | | | | If the docker version on a master or node is under 1.12 and the OS is an Atomic Host variant the installation should fail. Fixes: BZ1425583 | ||||
* | | Merge pull request #3533 from kwoodson/registry_updates | Andrew Butcher | 2017-03-02 | 3 | -1/+7 |
|\ \ | | | | | | | Fixed error handling when oc adm ca create-server-cert fails. Fixed a logic error in secure. | ||||
| * | | Fixed error handling when oc adm ca create-server-cert fails. Fixed a logic ↵ | Kenny Woodson | 2017-03-01 | 3 | -1/+7 |
| | | | | | | | | | | | | error in secure. | ||||
* | | | Merge pull request #3542 from sdodson/remove-contiv-from-rpms | Scott Dodson | 2017-03-02 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Remove contiv role and playbook from rpm packages | ||||
| * | | | Remove contiv role and playbook from rpm packages | Scott Dodson | 2017-03-02 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #3393 from srampal/contiv | Scott Dodson | 2017-03-01 | 44 | -6/+984 |
|\ \ \ | | | | | | | | | Pull request for Contiv Ansible code integration into Openshift Ansible | ||||
| * | | | Combined (squashed) commit for all changes related to adding Contiv support ↵ | Sanjeev Rampal | 2017-02-27 | 44 | -6/+984 |
| | | | | | | | | | | | | | | | | into Openshift Ansible. This is the first (beta) release of Contiv with Openshift and is only supported for Openshift Origin + Bare metal deployments at the time of this commit. Please refer to the Openshift and Contiv official documentation for details of the level of support for different features and modes of operation. | ||||
* | | | | Merge pull request #3528 from abutcher/master-scaleup | Scott Dodson | 2017-03-01 | 2 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | Bug 1427003: Failed to add masters if openshift_master_ca_certificate is defined | ||||
| * | | | Add ca-bundle.crt to list of certs to synchronize. | Andrew Butcher | 2017-02-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Do not force custom ca cert deployment. | Andrew Butcher | 2017-02-28 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #3532 from sdodson/fis-templates | Scott Dodson | 2017-03-01 | 45 | -7/+14630 |
|\ \ \ \ | | | | | | | | | | | Add FIS templates | ||||
| * | | | | Add v1.3 FIS templates | Scott Dodson | 2017-03-01 | 16 | -2/+5066 |
| | | | | | |||||
| * | | | | v1.4 Add FIS templates | Scott Dodson | 2017-03-01 | 14 | -0/+4777 |
| | | | | | |||||
| * | | | | Add FIS templates | Scott Dodson | 2017-03-01 | 15 | -5/+4787 |
| | | | | | |||||
* | | | | | Merge pull request #3493 from kwoodson/registry_reencyrpt_route | Scott Dodson | 2017-03-01 | 25 | -145/+278 |
|\ \ \ \ \ | | | | | | | | | | | | | Adding support for a route with reencrypt and certificates. | ||||
| * | | | | | removing extra when condition | Kenny Woodson | 2017-03-01 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Removing run_once. | Kenny Woodson | 2017-03-01 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Adding the activeDeadlineSeconds. Removed debug. | Kenny Woodson | 2017-03-01 | 2 | -11/+3 |
| | | | | | | |||||
| * | | | | | Separating routes so logic is simpler. | Kenny Woodson | 2017-03-01 | 1 | -6/+30 |
| | | | | | | |||||
| * | | | | | Defaulting variables properly to avoid undefined route in dict error. | Kenny Woodson | 2017-03-01 | 2 | -17/+16 |
| | | | | | | |||||
| * | | | | | Removed duplicate host param. | Kenny Woodson | 2017-02-28 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Fixed failures on create when objects exist. | Kenny Woodson | 2017-02-28 | 4 | -95/+163 |
| | | | | | | |||||
| * | | | | | Updating delete/recreate with replace --force. | Kenny Woodson | 2017-02-28 | 3 | -18/+10 |
| | | | | | | |||||
| * | | | | | Fixed logic error. Ensure both svc and dc exist. | Kenny Woodson | 2017-02-28 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Modified base debug statements. Fixed oc_secret debug/verbose flag. Added ↵ | Kenny Woodson | 2017-02-28 | 24 | -62/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | reencrypt for route. | ||||
| * | | | | | Adding support for a route with certs and reencrypt. | Kenny Woodson | 2017-02-28 | 4 | -3/+49 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3526 from richm/fluentd-filter-renamed-to-viaq | Jeff Cantrill | 2017-03-01 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | logging fluentd filter was renamed to viaq | ||||
| * | | | | logging fluentd filter was renamed to viaq | Rich Megginson | 2017-02-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3502 from ↵ | Jan Chaloupka | 2017-03-01 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | ingvagabund/when-installing-excluder-install-the-latest install the latest excluders | ||||
| * | | | | install the latest excluders | Jan Chaloupka | 2017-02-27 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3522 from mtnbikenc/pvc-type-fix | Russell Teague | 2017-02-28 | 2 | -8/+10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add 'persistentVolumeClaim' to volume_info type | ||||
| * | | | | Add 'persistentVolumeClaim' to volume_info type | Russell Teague | 2017-02-28 | 2 | -8/+10 |
| | | | | | |||||
* | | | | | Merge pull request #3434 from giuseppe/system-containers-module | Giuseppe Scrivano | 2017-02-28 | 10 | -164/+448 |
|\ \ \ \ \ | |/ / / / |/| | | | | System containers module | ||||
| * | | | | node: use the new oc_atomic_container module | Giuseppe Scrivano | 2017-02-28 | 3 | -60/+18 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | | | master: use the new oc_atomic_container module | Giuseppe Scrivano | 2017-02-28 | 2 | -57/+23 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | | | etcd: use the new oc_atomic_container module | Giuseppe Scrivano | 2017-02-28 | 1 | -47/+25 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> |