summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused argumentRodolfo Carvalho2017-03-061-1/+1
| | | | Detected by pylint. The fixture indeed doesn't require an argument.
* Remove unused Makefile variablesRodolfo Carvalho2017-03-061-5/+0
|
* Merge pull request #3556 from dcbw/sdn-preserve-var-lib-cniScott Dodson2017-03-032-2/+2
|\ | | | | node/sdn: make /var/lib/cni persistent to ensure IPAM allocations stick around across node restart
| * node/sdn: make /var/lib/cni persistent to ensure IPAM allocations stick ↵Dan Williams2017-03-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around across node restart With the move to a CNI plugin, docker no longer handles IPAM, but CNI does through openshift-sdn's usage of the 'host-local' CNI IPAM plugin. That plugin stores IPAM allocations under /var/lib/cni/. If the node container gets restarted, without presreving /var/lib/cni, the IPs currently allocated to running pods get lost and on restart, openshift-sdn may allocate those IPs to new pods causing duplicate allocations. This never happened with docker because it has its own persistent IPAM store that does not get removed when docker restarts. Also because (historically) when docker restarted, all the containers died and the IP allocations were released by the daemon. Fix this by ensuring that IPAM allocations (which are tied to the life of the pod, *not* the life of the openshift-node process) persist even if the openshift-node process restarts. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1427789
* | Merge pull request #3499 from sdodson/1422348Scott Dodson2017-03-037-29/+20
|\ \ | |/ |/| Don't install python-ruamel-yaml
| * BZ1422348 - Don't install python-ruamel-yamlScott Dodson2017-03-035-25/+2
| | | | | | | | Just rely on PyYAML as a fallback and hope that's there
| * Re-generate modulesScott Dodson2017-03-032-4/+18
|/
* Merge pull request #3527 from joelddiaz/yedit-path-exceptionsKenny Woodson2017-03-0320-39/+191
|\ | | | | raise exceptions when walking through object path
| * regenerate lib_openshift with yedit exception changesJoel Diaz2017-02-2817-34/+153
| |
| * raise exceptions when walking through object pathJoel Diaz2017-02-283-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we're given path a.b.c and the existing object is: a: b: - item1 raise an exception due to unexpected objects found while traversing the path (ie. b is a list, not a dict) also, add_entry assumes new dicts for each sub element when creating elements besides the final assignment value. doing something like a.b.c[0] = 12 where 'c' doesn't exist raises an exception add test cases to cover: access path that differs from existing object create new objects with an embedded list in the path create new object with a list at the end (define the end list in the passed in 'value' to avoid this exception)
* | Merge pull request #3550 from ewolinetz/logging_update_metaScott Dodson2017-03-031-1/+0
|\ \ | | | | | | Removing the openshift_master_facts dependency
| * | Removing the openshift_master_facts dependencyewolinetz2017-03-021-1/+0
| | |
* | | Merge pull request #3551 from sdodson/BZ1428532Scott Dodson2017-03-031-1/+8
|\ \ \ | | | | | | | | Only set ownership to etcd for thirdparty datadir
| * | | Only set ownership to etcd for thirdparty datadirScott Dodson2017-03-021-1/+8
| |/ / | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1428532
* | | Merge pull request #3548 from jcantrill/bz_1420256_again_reset_pvc_factsScott Dodson2017-03-022-18/+23
|\ \ \ | | | | | | | | bug 1420256. Initialize openshift_logging pvc_facts to empty
| * | | bug 1420256. Initialize openshift_logging pvc_facts to emptyJeff Cantrill2017-03-022-18/+23
| | | |
* | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 21:25:56 +0000