summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3574 from sdodson/35_sdnvalidatorScott Dodson2017-03-076-3/+47
|\ | | | | Add oc_objectvalidator to upgrade check
| * Generic message directing people to contact supportScott Dodson2017-03-073-3/+21
| |
| * Add oc_objectvalidator to upgrade checkScott Dodson2017-03-073-0/+26
| |
* | Merge pull request #3565 from ↵Andrew Butcher2017-03-071-2/+7
|\ \ | | | | | | | | | | | | EricMountain-1A/fix_upstream_docker_registries_order Preserve order of Docker registries
| * | Preserve order of Docker registriesEric Mountain2017-03-071-2/+7
| | | | | | | | | | | | | | | | | | List of additional/blocked/insecure Docker registries was being converted to a set, thereby dropping the original order. Fixed to preserve order of the registries (this allows prioritising registries).
* | | Merge pull request #3582 from kwoodson/router_sharding_docScott Dodson2017-03-072-1/+89
|\ \ \ | | | | | | | | Augmenting documentation for router sharding.
| * | | Adding into the origin inventory doc.Kenny Woodson2017-03-071-1/+45
| | | |
| * | | Augmenting documentation for router sharding.Kenny Woodson2017-03-071-0/+44
|/ / /
* / / openshift_facts: ensure system containers deps are installedGiuseppe Scrivano2017-03-072-0/+14
|/ / | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #3517 from ewolinetz/idempotency_role_bindingsEric Wolinetz2017-03-061-4/+20
|\ \ | | | | | | Adding changed_whens for role, rolebinding, and scc reconciliation ba…
| * | Updating stdout check for changed_whenewolinetz2017-03-021-5/+5
| | |
| * | Resolving yammlint errorsewolinetz2017-03-011-8/+8
| | |
| * | Adding changed_whens for role, rolebinding, and scc reconciliation based on ↵ewolinetz2017-02-281-4/+20
| | | | | | | | | | | | output from oadm policy command
* | | Enable coveralls.ioJason DeTiberus2017-03-062-1/+5
| |/ |/|
* | Merge pull request #3575 from sdodson/BZ1423430Scott Dodson2017-03-061-1/+1
|\ \ | | | | | | Fix indentation of run_once
| * | Fix indentation of run_onceScott Dodson2017-03-061-1/+1
|/ / | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1423430
* | Merge pull request #3569 from detiber/consolidateToxJason DeTiberus2017-03-0616-279/+44
|\ \ | | | | | | Consolidate root/utils tests
| * | Update docs for test consolidation and remove the MakefileJason DeTiberus2017-03-063-169/+6
| | |
| * | Consolidate root/utils testsJason DeTiberus2017-03-0613-110/+38
| | | | | | | | | | | | - Consolidate tests between the root of the repo and utils
* | | Merge pull request #3570 from rhcarvalho/more-misc-cleanupJason DeTiberus2017-03-0616-324/+0
|\ \ \ | | | | | | | | Remove lots of dead code in tests
| * | | Remove dummy setup/teardown methodsRodolfo Carvalho2017-03-0613-104/+0
| | | |
| * | | Clean up test filesRodolfo Carvalho2017-03-0615-181/+0
| | | | | | | | | | | | | | | | | | | | They are not executable anymore, and tests are now meant to be run through pytest.
| * | | Remove commented-out test codeRodolfo Carvalho2017-03-061-39/+0
|/ / /
* | | Merge pull request #3535 from enj/enj/f/reserve_ns_moduleScott Dodson2017-03-068-578/+1051
|\ \ \ | | | | | | | | Add pre-upgrade check for reserved namespaces
| * | | Make generic OCObjectValidator from OCSDNValidatorMonis Khan2017-03-068-578/+1051
|/ / / | | | | | | | | | Signed-off-by: Monis Khan <mkhan@redhat.com>
* | | Merge pull request #3567 from richm/logging-needs-openshift_master_factsScott Dodson2017-03-061-0/+1
|\ \ \ | | | | | | | | logging needs openshift_master_facts before openshift_facts
| * | | logging needs openshift_master_facts before openshift_factsRich Megginson2017-03-061-0/+1
| |/ /
* | | Merge pull request #3382 from codificat/playbook2imageScott Dodson2017-03-065-20/+105
|\ \ \ | |/ / |/| | Dockerfile and docs to run containerized playbooks
| * | Dockerfile and docs to run containerized playbooksPep Turró Mauri2017-03-065-20/+105
| | | | | | | | | | | | | | | | | | | | | | | | Update openshift-ansible's Dockerfile to use playbook2image as a base, with the goal to run an arbitrary playbook from a container. The existing Dockerfile is moved to Dockerfile.rhel7 for the productized version and will be updated to use playbook2image later.
* | | Merge pull request #3566 from detiber/testConfigsJason DeTiberus2017-03-064-28/+23
|\ \ \ | |/ / |/| | separate out test tool configs from setup.cfg
| * | separate out test tool configs from setup.cfgJason DeTiberus2017-03-064-28/+23
| | | | | | | | | | | | | | | Since we are moving away from setuptools for invoking tests, lets move the configs for the different test tools into their own configs.
* | | Merge pull request #3549 from kwoodson/router_shardingScott Dodson2017-03-062-61/+54
|\ \ \ | | | | | | | | Adding support for multiple router shards.
| * | | Added ports.Kenny Woodson2017-03-022-0/+6
| | | |
| * | | Fixed router name to produce 2nd router.Kenny Woodson2017-03-021-1/+1
| | | |
| * | | Updated to work with an array of routers.Kenny Woodson2017-03-022-61/+19
| | | |
| * | | Adding support for router sharding.Kenny Woodson2017-03-022-61/+90
| | | |
* | | | Merge pull request #3325 from kwoodson/oc_projectKenny Woodson2017-03-069-1/+2280
|\ \ \ \ | |_|/ / |/| | | Adding oc_project to lib_openshift.
| * | | Lower test coverage percentage.Kenny Woodson2017-03-061-1/+1
| | | |
| * | | Mock runs differntly on travis. Fix the mock test params to be ANY.Kenny Woodson2017-03-061-3/+2
| | | |
| * | | Fixed the none namespace. Fixed tests with latest loc_oc_binary call.Kenny Woodson2017-03-063-5/+10
| | | |
| * | | Updating the namespace param to None.Kenny Woodson2017-03-062-2/+2
| | | |
| * | | Regenerated code with latest yedit changes.Kenny Woodson2017-03-061-4/+11
| | | |
| * | | Fixed tests to align with new naming.Kenny Woodson2017-03-061-1/+1
| | | |
| * | | Fixed docs. Added check for delete failures. Updated namespace to None.Kenny Woodson2017-03-063-49/+144
| | | |
| * | | Fixing lintersKenny Woodson2017-03-063-4/+3
| | | |
| * | | Adding integration test. Fixed issue with node_selector.Kenny Woodson2017-03-063-8/+97
| | | |
| * | | Adding oc_project to lib_openshift.Kenny Woodson2017-03-067-0/+2085
| | | |
* | | | Merge pull request #3563 from rhcarvalho/misc-cleanupRodolfo Carvalho2017-03-069-140/+48
|\ \ \ \ | |/ / / |/| | | Misc cleanup
| * | | Remove old commented-out testsRodolfo Carvalho2017-03-061-91/+0
| | | |
| * | | Remove redundant assertionRodolfo Carvalho2017-03-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | That line is testing Python's list.count method, instead of yedit. The assertion right above is a superset of it, as it checks for equality to some expected value.