Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3447 from kwoodson/router_no_default_cert | Kenny Woodson | 2017-02-22 | 5 | -12/+38 |
|\ | | | | | Fix for no default_cert or cert, key, cacert files | ||||
| * | Added required_together. Added two minor bug fixes for when data is not passed. | Kenny Woodson | 2017-02-22 | 5 | -12/+20 |
| | | |||||
| * | if no key, cert, cacert, or default_cert is passed then do not pass to oc | Kenny Woodson | 2017-02-21 | 3 | -4/+22 |
| | | |||||
* | | Merge pull request #3454 from ewolinetz/logging_tag_master_config | Scott Dodson | 2017-02-22 | 1 | -0/+2 |
|\ \ | | | | | | | adding tag to update_master_config | ||||
| * | | adding tag to update_master_config | ewolinetz | 2017-02-22 | 1 | -0/+2 |
| |/ | |||||
* / | CloudFront oc_secret contents should be a list | Steve Milner | 2017-02-22 | 1 | -2/+2 |
|/ | | | | | Fixes "argument contents is of type <type 'dict'> and we were unable to convert to list" | ||||
* | Merge pull request #3438 from jcantrill/bz_1425321_default_api_port | Scott Dodson | 2017-02-21 | 2 | -2/+2 |
|\ | | | | | Bz 1425321 default api port | ||||
| * | bug 1425321. Default the master api port based on the facts | Jeff Cantrill | 2017-02-21 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #3444 from richm/bug-1420219 | Scott Dodson | 2017-02-21 | 1 | -0/+5 |
|\ \ | | | | | | | Bug 1420219 - No log entry can be found in Kibana UI after deploying logging stacks with ansible | ||||
| * | | Bug 1420219 - No log entry can be found in Kibana UI after deploying logging ↵ | Rich Megginson | 2017-02-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | stacks with ansible https://bugzilla.redhat.com/show_bug.cgi?id=1420219 The elasticsearch config was missing the common data model stanza | ||||
* | | | Merge pull request #3436 from tbielawa/hacky_cert_parsing | Tim Bielawa | 2017-02-21 | 6 | -18/+486 |
|\ \ \ | |/ / |/| | | Implement fake openssl cert classes | ||||
| * | | Address cert expiry parsing review comments | Tim Bielawa | 2017-02-21 | 2 | -8/+7 |
| | | | |||||
| * | | Implement fake openssl cert classes | Tim Bielawa | 2017-02-21 | 6 | -16/+485 |
| | | | |||||
* | | | Merge pull request #3377 from kwoodson/router_registry | Russell Teague | 2017-02-21 | 34 | -11/+7229 |
|\ \ \ | | | | | | | | | Adding oc_adm_router and oc_adm_registry to lib_openshift | ||||
| * | | | Removed oadm_ references in doc. | Kenny Woodson | 2017-02-21 | 4 | -4/+4 |
| | | | | |||||
| * | | | Removed unused code. Made tests executable. | Kenny Woodson | 2017-02-21 | 15 | -50/+12 |
| | | | | |||||
| * | | | Fixing docs. Fixed default_cert suggestion. | Kenny Woodson | 2017-02-20 | 11 | -72/+173 |
| | | | | |||||
| * | | | Renamed modules, fixed docs, renamed variables, and cleaned up logic. | Kenny Woodson | 2017-02-20 | 18 | -262/+340 |
| | | | | |||||
| * | | | Renaming registry and router roles to oc_adm_ | Kenny Woodson | 2017-02-20 | 8 | -15/+15 |
| | | | | |||||
| * | | | Fixing registry doc and suggestions. | Kenny Woodson | 2017-02-20 | 5 | -114/+172 |
| | | | | |||||
| * | | | Adding router and registry to lib_openshift. | Kenny Woodson | 2017-02-20 | 12 | -1/+7020 |
| | | | | |||||
* | | | | Fix typo | Rodolfo Carvalho | 2017-02-21 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #3431 from jcantrill/bz_1420256_ops_reusing_non_ops_prefix | Jeff Cantrill | 2017-02-21 | 2 | -2/+4 |
|\ \ \ | |_|/ |/| | | Bz 1420256 ops reusing non ops prefix | ||||
| * | | bug 142026. Ensure Ops PVC prefix are initialized to empty when ops e… | Jeff Cantrill | 2017-02-20 | 2 | -2/+4 |
| | | | | | | | | | | | | nabled | ||||
* | | | Merge pull request #3428 from giuseppe/do-not-parse-latest | Scott Dodson | 2017-02-21 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | openshift_facts: handle 'latest' version | ||||
| * | | openshift_facts: handle 'latest' version | Giuseppe Scrivano | 2017-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | do not attempt to compare the version using LooseVersion when 'latest' is used. The case openshift_version == None already sets to use the last version, so simply reuse that. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | Merge pull request #3409 from ewolinetz/logging_fix_verify_api | Scott Dodson | 2017-02-20 | 2 | -0/+42 |
|\ \ \ | |_|/ |/| | | Adding missing handler to resolve error that it was not found | ||||
| * | | Reverting logic for verify api handler to be uniform with other ways we ↵ | ewolinetz | 2017-02-20 | 2 | -10/+30 |
| | | | | | | | | | | | | verify, will be uniformly updated in future | ||||
| * | | updating until statments on uri module for api verification | ewolinetz | 2017-02-17 | 2 | -2/+2 |
| | | | |||||
| * | | Updating to use uri module instead | ewolinetz | 2017-02-17 | 2 | -30/+10 |
| | | | |||||
| * | | Adding missing handler to resolve error that it was not found | ewolinetz | 2017-02-17 | 2 | -0/+42 |
| | | | |||||
* | | | Merge pull request #3427 from ewolinetz/logging_quote_nodeselector_value | Scott Dodson | 2017-02-20 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Surrounding node selector values with quotes | ||||
| * | | | Surrounding node selector values with quotes | ewolinetz | 2017-02-20 | 3 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #3422 from mtnbikenc/logging-fix | Russell Teague | 2017-02-20 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | [openshift_logging] Correct logic test for running pods | ||||
| * | | | Correct logic test for running pods | Russell Teague | 2017-02-20 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #3424 from ashcrow/new-modules-py3 | Jason DeTiberus | 2017-02-20 | 3 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Replace has_key in new modules | ||||
| * | | | | Replace has_key in new modules | Steve Milner | 2017-02-20 | 3 | -4/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | The dict.has_key has been removed in Python 3. However, both Python 2 and 3 support: if needle in dict | ||||
* | | | | Merge pull request #3419 from rhcarvalho/pytest | Jason DeTiberus | 2017-02-20 | 4 | -332/+271 |
|\ \ \ \ | | | | | | | | | | | Migrate from nose to pytest | ||||
| * | | | | Extract assertion common to all tests as function | Rodolfo Carvalho | 2017-02-20 | 2 | -56/+24 |
| | | | | | |||||
| * | | | | Replace nose yield-style tests w/ pytest fixtures | Rodolfo Carvalho | 2017-02-20 | 3 | -248/+247 |
| | | | | | |||||
| * | | | | Make tests run with either nosetests or pytest | Rodolfo Carvalho | 2017-02-20 | 3 | -45/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And remove explicit dependencies on nose, replacing with pytest. The former is the way forward, for it is a better maintained test library, and a transitive dependency of `molecule`, the test framework we're using to add integration tests to this repo (work in progress). | ||||
| * | | | | Replace assert_equal with plain assert | Rodolfo Carvalho | 2017-02-20 | 2 | -28/+24 |
| | | | | | | | | | | | | | | | | | | | | In the intention to remove the dependency on nose and use only pytest. | ||||
| * | | | | Make usage of short_version/release consistent | Rodolfo Carvalho | 2017-02-20 | 2 | -27/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This removes irrelevant differences between the two test files, making it easier to observe similarities. | ||||
| * | | | | Reorganize tests and helper functions logically | Rodolfo Carvalho | 2017-02-20 | 2 | -129/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intented to make it easier to read tests top-down. The test methods in both files are sorted somehow logically, and in the same order in both files, to help visualizing the similarities between them with diff tools. | ||||
| * | | | | Remove test duplication | Rodolfo Carvalho | 2017-02-20 | 3 | -80/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate tests for bad input into a single file instead of having the same code in two files. | ||||
| * | | | | Move similar test cases together | Rodolfo Carvalho | 2017-02-20 | 2 | -64/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | And reorganize them in such a way to show that there are a bunch of duplicated tests that are exactly the same. | ||||
| * | | | | Insert paths in the second position of sys.path | Rodolfo Carvalho | 2017-02-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/a/10097543/4804690 Additionally, avoid using platform-specific '/' and '..'. | ||||
| * | | | | Rename test for consistency | Rodolfo Carvalho | 2017-02-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix validation of generated code | Rodolfo Carvalho | 2017-02-20 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | Importing modules with the same name will not reload an already imported module. Explicitly reloading the module is the quickest fix. | ||||
* | | | | Merge pull request #3407 from mtnbikenc/oc-mod-playbooks | Russell Teague | 2017-02-20 | 1 | -16/+21 |
|\ \ \ \ | | | | | | | | | | | Updating node playbooks to use oc_obj |