summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3538 from mtnbikenc/bugfix-hosted-registryScott Dodson2017-03-021-1/+9
|\ | | | | Correct config for hosted registry
| * Add oc_adm_policy_user task cluster-role policyRussell Teague2017-03-021-0/+7
| |
| * Correct config for hosted registryRussell Teague2017-03-021-1/+2
|/
* Merge pull request #3547 from jupierce/oadm_policy_group_patchScott Dodson2017-03-024-4/+4
|\ | | | | Fixing checkout for bindings with -binding suffix
| * Fixing checkout for bindings with -binding suffixjupierce2017-03-024-4/+4
| |
* | Merge pull request #3449 from detiber/hacky_cert_parsingJason DeTiberus2017-03-029-352/+293
|\ \ | |/ |/| [wip] test fixes for openshift_certificates_expiry
| * test fixes for openshift_certificates_expiryJason DeTiberus2017-03-029-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-removalScott Dodson2017-03-021-1/+1
|\ \ | | | | | | Leave an empty contiv role directory
| * | Leave an empty contiv role directoryScott Dodson2017-03-021-1/+1
| |/
* | Merge pull request #3534 from jupierce/oadm_policy_groupScott Dodson2017-03-0210-0/+5030
|\ \ | |/ |/| oadm_policy_group/adm_policy_user module
| * oadm_policy_group/adm_policy_user modulejupierce2017-03-0210-0/+5030
|/
* Merge pull request #3475 from ashcrow/1425583Tim Bielawa2017-03-021-0/+19
|\ | | | | Fails Installation If Docker Version is Too Old On Atomic Host
| * Fail on Atomic if docker is too oldSteve Milner2017-03-021-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_updatesAndrew Butcher2017-03-023-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 Woodson2017-03-013-1/+7
| | | | | | | | | | | | error in secure.
* | | Merge pull request #3542 from sdodson/remove-contiv-from-rpmsScott Dodson2017-03-021-0/+4
|\ \ \ | | | | | | | | Remove contiv role and playbook from rpm packages
| * | | Remove contiv role and playbook from rpm packagesScott Dodson2017-03-021-0/+4
|/ / /
* | | Merge pull request #3393 from srampal/contivScott Dodson2017-03-0144-6/+984
|\ \ \ | | | | | | | | Pull request for Contiv Ansible code integration into Openshift Ansible
| * | | Combined (squashed) commit for all changes related to adding Contiv support ↵Sanjeev Rampal2017-02-2744-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-scaleupScott Dodson2017-03-012-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 Butcher2017-02-281-1/+1
| | | |
| * | | Do not force custom ca cert deployment.Andrew Butcher2017-02-281-0/+1
| | | |
* | | | Merge pull request #3532 from sdodson/fis-templatesScott Dodson2017-03-0145-7/+14630
|\ \ \ \ | | | | | | | | | | Add FIS templates
| * | | | Add v1.3 FIS templatesScott Dodson2017-03-0116-2/+5066
| | | | |
| * | | | v1.4 Add FIS templatesScott Dodson2017-03-0114-0/+4777
| | | | |
| * | | | Add FIS templatesScott Dodson2017-03-0115-5/+4787
| | | | |
* | | | | Merge pull request #3493 from kwoodson/registry_reencyrpt_routeScott Dodson2017-03-0125-145/+278
|\ \ \ \ \ | | | | | | | | | | | | Adding support for a route with reencrypt and certificates.
| * | | | | removing extra when conditionKenny Woodson2017-03-011-1/+0
| | | | | |
| * | | | | Removing run_once.Kenny Woodson2017-03-011-4/+0
| | | | | |
| * | | | | Adding the activeDeadlineSeconds. Removed debug.Kenny Woodson2017-03-012-11/+3
| | | | | |
| * | | | | Separating routes so logic is simpler.Kenny Woodson2017-03-011-6/+30
| | | | | |
| * | | | | Defaulting variables properly to avoid undefined route in dict error.Kenny Woodson2017-03-012-17/+16
| | | | | |
| * | | | | Removed duplicate host param.Kenny Woodson2017-02-281-1/+0
| | | | | |
| * | | | | Fixed failures on create when objects exist.Kenny Woodson2017-02-284-95/+163
| | | | | |
| * | | | | Updating delete/recreate with replace --force.Kenny Woodson2017-02-283-18/+10
| | | | | |
| * | | | | Fixed logic error. Ensure both svc and dc exist.Kenny Woodson2017-02-282-2/+2
| | | | | |
| * | | | | Modified base debug statements. Fixed oc_secret debug/verbose flag. Added ↵Kenny Woodson2017-02-2824-62/+80
| | | | | | | | | | | | | | | | | | | | | | | | reencrypt for route.
| * | | | | Adding support for a route with certs and reencrypt.Kenny Woodson2017-02-284-3/+49
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3526 from richm/fluentd-filter-renamed-to-viaqJeff Cantrill2017-03-011-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | logging fluentd filter was renamed to viaq
| * | | | logging fluentd filter was renamed to viaqRich Megginson2017-02-281-1/+1
| | | | |
* | | | | Merge pull request #3502 from ↵Jan Chaloupka2017-03-011-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | ingvagabund/when-installing-excluder-install-the-latest install the latest excluders
| * | | | install the latest excludersJan Chaloupka2017-02-271-0/+2
| | | | |
* | | | | Merge pull request #3522 from mtnbikenc/pvc-type-fixRussell Teague2017-02-282-8/+10
|\ \ \ \ \ | |_|/ / / |/| | | | Add 'persistentVolumeClaim' to volume_info type
| * | | | Add 'persistentVolumeClaim' to volume_info typeRussell Teague2017-02-282-8/+10
| | | | |
* | | | | Merge pull request #3434 from giuseppe/system-containers-moduleGiuseppe Scrivano2017-02-2810-164/+448
|\ \ \ \ \ | |/ / / / |/| | | | System containers module
| * | | | node: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-283-60/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | master: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-282-57/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | etcd: use the new oc_atomic_container moduleGiuseppe Scrivano2017-02-281-47/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | lib_openshift: new module atomic_containerGiuseppe Scrivano2017-02-284-0/+382
| | |/ / | |/| | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3515 from mtnbikenc/registry-pvc-fixRussell Teague2017-02-281-2/+3
|\ \ \ \ | |/ / / |/| | | BZ1427009: Correct fact creation for pvc
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:20:20 +0000