Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3615 from ashcrow/nuage-3583 | OpenShift Bot | 2017-03-10 | 2 | -2/+2 |
|\ | | | | | Merged by openshift-bot | ||||
| * | nuage: Move role back to config | Steve Milner | 2017-03-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | d113f03 moved role dependencies out of playbooks. However, this ended up causing the masters to not be configured before the nuage steps required configured masters. This change moves the nuage specific change in d113f03 back to the config. Resolves #3583 | ||||
* | | Merge pull request #3624 from codificat/fix-readme-container | Scott Dodson | 2017-03-10 | 1 | -7/+7 |
|\ \ | | | | | | | Minor updates to README_CONTAINER_IMAGE.md | ||||
| * | | Minor updates to README_CONTAINER_IMAGE.md | Pep Turró Mauri | 2017-03-10 | 1 | -7/+7 |
| |/ | | | | | | | Fix link to the example role, prefix image name with openshift/. | ||||
* | | Merge pull request #3616 from richm/missing-searchguard.truststore | OpenShift Bot | 2017-03-10 | 1 | -1/+1 |
|\ \ | |/ |/| | Merged by openshift-bot | ||||
| * | Bug 1428711 - [IntService_public_324] ES pod is unable to read ↵ | Rich Megginson | 2017-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | searchguard.truststore after upgarde logging from 3.3.1 to 3.5.0 https://bugzilla.redhat.com/show_bug.cgi?id=1428711 The list of secrets for elasticsearch was missing searchguard.truststore | ||||
* | | Merge pull request #3618 from germansosa/master | Scott Dodson | 2017-03-10 | 2 | -2/+2 |
|\ \ | | | | | | | Fix references to openshift_set_node_ip in inventory examples | ||||
| * | | Fix references to openshift_set_node_ip in inventory examples | germansosa | 2017-03-10 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3613 from detiber/module_utils_six | OpenShift Bot | 2017-03-10 | 6 | -31/+33 |
|\ \ \ | |/ / |/| | | Merged by openshift-bot | ||||
| * | | Use ansible.compat.six where possible | Jason DeTiberus | 2017-03-09 | 4 | -26/+30 |
| | | | |||||
| * | | Use six from ansible.module_utils for remote hosts | Jason DeTiberus | 2017-03-09 | 5 | -8/+6 |
| | | | |||||
* | | | Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067 | OpenShift Bot | 2017-03-09 | 4 | -2/+20 |
|\ \ \ | |_|/ |/| | | Merged by openshift-bot | ||||
| * | | Remove debug task | Tim Bielawa | 2017-03-09 | 1 | -3/+0 |
| | | | |||||
| * | | New role | Tim Bielawa | 2017-03-08 | 4 | -2/+23 |
| | | | |||||
* | | | Merge pull request #3605 from kwoodson/oc_adm_policy_user_fix | OpenShift Bot | 2017-03-09 | 6 | -54/+5319 |
|\ \ \ | |_|/ |/| | | Merged by openshift-bot | ||||
| * | | Fixing the way policies are found. The old method was unreliable. This ↵ | Kenny Woodson | 2017-03-08 | 6 | -54/+5319 |
| |/ | | | | | | | method searches all and matches on properties. | ||||
* | | Merge pull request #3590 from kwoodson/router_registry_unit_tests | Andrew Butcher | 2017-03-09 | 26 | -51/+915 |
|\ \ | | | | | | | Fix to OpenshiftCLIConfig to support an sorted keys. Removed redundant get. | ||||
| * | | Lowering test coverage percentage. | Kenny Woodson | 2017-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | Removing ordereddict. Replaced with sorted keys. | Kenny Woodson | 2017-03-08 | 26 | -95/+97 |
| | | | |||||
| * | | Fixed for linting. | Kenny Woodson | 2017-03-08 | 2 | -5/+1 |
| | | | |||||
| * | | Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test ↵ | Kenny Woodson | 2017-03-07 | 26 | -115/+420 |
| | | | | | | | | | | | | cases. | ||||
| * | | Adding test_oc_adm_router. | Kenny Woodson | 2017-03-07 | 1 | -0/+476 |
| | | | |||||
| * | | Adding router test. | Kenny Woodson | 2017-03-07 | 1 | -0/+85 |
| | | | |||||
* | | | Merge pull request #3586 from srampal/issue3541 | Scott Dodson | 2017-03-09 | 4 | -1/+36 |
|\ \ \ | | | | | | | | | Fix for issue 3541 | ||||
| * | | | Fix for issue 3541 | Sanjeev Rampal | 2017-03-07 | 4 | -1/+36 |
| | | | | |||||
* | | | | Merge pull request #3607 from ingvagabund/extend-excluders-to-containerized-ocp | Jan Chaloupka | 2017-03-09 | 6 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | extend the excluders to containerized deployment | ||||
| * | | | | extend the excluders to containerized deployment | Jan Chaloupka | 2017-03-09 | 6 | -6/+6 |
|/ / / / | |||||
* | | | | Merge pull request #3604 from sdodson/issue3603 | Scott Dodson | 2017-03-08 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | openshift_excluders depends on openshift_repos | ||||
| * | | | | openshift_excluders depends on openshift_repos | Scott Dodson | 2017-03-08 | 1 | -0/+1 |
| | |_|/ | |/| | | | | | | | | | | | | | | So that centos repos are provisioned before attempting to install the excluders | ||||
* | | | | Merge pull request #3601 from mmckinst/etcd_version | OpenShift Bot | 2017-03-08 | 5 | -3/+7 |
|\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| * | | | add ability to specify an etcd version | Mark McKinstry | 2017-03-08 | 5 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #3589 from brenton/master | Scott Dodson | 2017-03-08 | 2 | -0/+142 |
|\ \ \ \ | | | | | | | | | | | Adding scripts for building and pushing images | ||||
| * | | | | Adding scripts for building and pushing images | Brenton Leanhardt | 2017-03-07 | 2 | -0/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These scripts follow the same pattern as the origin and origin-metrics repo. From there the Jenkins job will be very simple. | ||||
* | | | | | Merge pull request #3597 from ingvagabund/enable-excluders-by-default | Scott Dodson | 2017-03-08 | 2 | -2/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | enable excluders by default | ||||
| * | | | | enable excluders by default | Jan Chaloupka | 2017-03-08 | 2 | -2/+4 |
|/ / / / | |||||
* | | | | Merge pull request #3595 from ↵ | Jan Chaloupka | 2017-03-08 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ingvagabund/check-docker-excluder-status-only-when-it-is-enabled Ignore the docker excluder status if it is not enabled by a user | ||||
| * | | | | ignore the docker excluder status if it is not enabled by a user | Jan Chaloupka | 2017-03-08 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3585 from tbielawa/petset_early_fail | Scott Dodson | 2017-03-07 | 3 | -3/+53 |
|\ \ \ \ | | | | | | | | | | | Petset early fail | ||||
| * | | | | Fix pylint/pyflakes errors on master | Scott Dodson | 2017-03-07 | 2 | -3/+4 |
| | | | | | |||||
| * | | | | Identify PetSets in 3.4 clusters and fail if any are detected | Tim Bielawa | 2017-03-07 | 1 | -0/+49 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PetSets are deprecated in 3.5, replaced with StatefulSets * We can not automatically migrate between the two * Red Hat has never supported PetSets nor do we support StatefulSets * Gracefully handles invalid resource queries if ran against 3.5+ clusters * Fails out with explanation and ref docs if petsets are detected Reference bug: https://bugzilla.redhat.com/show_bug.cgi?id=1428229 | ||||
* | | | | Merge pull request #3558 from ewolinetz/logging_metrics_defaults | Scott Dodson | 2017-03-07 | 10 | -24/+52 |
|\ \ \ \ | | | | | | | | | | | Adding some more logging and metrics defaults | ||||
| * | | | | More logging fixes | ewolinetz | 2017-03-07 | 4 | -8/+4 |
| | | | | | |||||
| * | | | | Fixing plugin, nodeselectors, and secret pull check | ewolinetz | 2017-03-07 | 5 | -6/+15 |
| | | | | | |||||
| * | | | | Updating metrics defaults | ewolinetz | 2017-03-06 | 2 | -6/+9 |
| | | | | | |||||
| * | | | | Adding some more logging defaults | ewolinetz | 2017-03-03 | 5 | -11/+31 |
| | | | | | |||||
* | | | | | Merge pull request #3529 from ingvagabund/upgrade-excluders-in-upgrade-only | Jan Chaloupka | 2017-03-07 | 26 | -96/+284 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | WIP: update excluders to latest by default, in non-upgrade scenarios do not update | ||||
| * | | | | - update excluders to latest, in non-upgrade scenarios do not update | Jan Chaloupka | 2017-03-07 | 26 | -96/+284 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - check both available excluder versions are at most of upgrade target version - get excluder status through status command - make excluders enablement configurable | ||||
* | | | | | Merge pull request #3588 from mtnbikenc/docker-fix | Scott Dodson | 2017-03-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Bug 1416156: Loosely couple docker to iptables service | ||||
| * | | | | | Loosely couple docker to iptables service | Russell Teague | 2017-03-07 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3574 from sdodson/35_sdnvalidator | Scott Dodson | 2017-03-07 | 6 | -3/+47 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add oc_objectvalidator to upgrade check |