summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* if no key, cert, cacert, or default_cert is passed then do not pass to ocKenny Woodson2017-02-213-4/+22
|
* Merge pull request #3438 from jcantrill/bz_1425321_default_api_portScott Dodson2017-02-212-2/+2
|\ | | | | Bz 1425321 default api port
| * bug 1425321. Default the master api port based on the factsJeff Cantrill2017-02-212-2/+2
| |
* | Merge pull request #3444 from richm/bug-1420219Scott Dodson2017-02-211-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 Megginson2017-02-211-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_parsingTim Bielawa2017-02-216-18/+486
|\ \ \ | |/ / |/| | Implement fake openssl cert classes
| * | Address cert expiry parsing review commentsTim Bielawa2017-02-212-8/+7
| | |
| * | Implement fake openssl cert classesTim Bielawa2017-02-216-16/+485
| | |
* | | Merge pull request #3377 from kwoodson/router_registryRussell Teague2017-02-2134-11/+7229
|\ \ \ | | | | | | | | Adding oc_adm_router and oc_adm_registry to lib_openshift
| * | | Removed oadm_ references in doc.Kenny Woodson2017-02-214-4/+4
| | | |
| * | | Removed unused code. Made tests executable.Kenny Woodson2017-02-2115-50/+12
| | | |
| * | | Fixing docs. Fixed default_cert suggestion.Kenny Woodson2017-02-2011-72/+173
| | | |
| * | | Renamed modules, fixed docs, renamed variables, and cleaned up logic.Kenny Woodson2017-02-2018-262/+340
| | | |
| * | | Renaming registry and router roles to oc_adm_Kenny Woodson2017-02-208-15/+15
| | | |
| * | | Fixing registry doc and suggestions.Kenny Woodson2017-02-205-114/+172
| | | |
| * | | Adding router and registry to lib_openshift.Kenny Woodson2017-02-2012-1/+7020
| | | |
* | | | Merge pull request #3440 from rhcarvalho/update-homepageScott Dodson2017-02-212-2/+2
|\ \ \ \ | |_|/ / |/| | | Update homepage and fix typo
| * | | Fix typoRodolfo Carvalho2017-02-211-1/+1
| | | |
| * | | Update link to project homepageRodolfo Carvalho2017-02-211-1/+1
|/ / /
* | | Merge pull request #3421 from jhadvig/registred-cmdRussell Teague2017-02-211-20/+0
|\ \ \ | | | | | | | | rename registered mktemp command
| * | | Remove unused playsjhadvig2017-02-211-20/+0
| | | |
* | | | Merge pull request #3431 from jcantrill/bz_1420256_ops_reusing_non_ops_prefixJeff Cantrill2017-02-212-2/+4
|\ \ \ \ | | | | | | | | | | Bz 1420256 ops reusing non ops prefix
| * | | | bug 142026. Ensure Ops PVC prefix are initialized to empty when ops e…Jeff Cantrill2017-02-202-2/+4
| | | | | | | | | | | | | | | | | | | | nabled
* | | | | Merge pull request #3437 from rhcarvalho/fix-setup-depsScott Dodson2017-02-211-3/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove pytest-related dependencies from setup.py
| * | | | Remove pytest-related dependencies from setup.pyRodolfo Carvalho2017-02-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `setup_requires` line prevents builds in internal environments without Internet access / pythonX-pytest-runner RPM installed. In fact, we're running tests with `pytest`, outside of `setup.py`, so we don't need those dependencies there. Note: we decided not to run tests through `python setup.py pytest` because pytest-runner was limited in how we can pass arguments to pytest / enable plugins. E.g., I could not get the coverage plugin working when running `python setup.py pytest`.
* | | | | Merge pull request #3428 from giuseppe/do-not-parse-latestScott Dodson2017-02-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | openshift_facts: handle 'latest' version
| * | | | openshift_facts: handle 'latest' versionGiuseppe Scrivano2017-02-201-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_apiScott Dodson2017-02-202-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 ↵ewolinetz2017-02-202-10/+30
| | | | | | | | | | | | | | | | | | | | verify, will be uniformly updated in future
| * | | | updating until statments on uri module for api verificationewolinetz2017-02-172-2/+2
| | | | |
| * | | | Updating to use uri module insteadewolinetz2017-02-172-30/+10
| | | | |
| * | | | Adding missing handler to resolve error that it was not foundewolinetz2017-02-172-0/+42
| | | | |
* | | | | Merge pull request #3427 from ewolinetz/logging_quote_nodeselector_valueScott Dodson2017-02-203-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Surrounding node selector values with quotes
| * | | | | Surrounding node selector values with quotesewolinetz2017-02-203-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #3422 from mtnbikenc/logging-fixRussell Teague2017-02-201-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | [openshift_logging] Correct logic test for running pods
| * | | | Correct logic test for running podsRussell Teague2017-02-201-3/+3
| | | | |
* | | | | Merge pull request #3424 from ashcrow/new-modules-py3Jason DeTiberus2017-02-203-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Replace has_key in new modules
| * | | | | Replace has_key in new modulesSteve Milner2017-02-203-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/pytestJason DeTiberus2017-02-2016-392/+374
|\ \ \ \ \ | | | | | | | | | | | | Migrate from nose to pytest
| * | | | | Raise the bar on coverage requirementsRodolfo Carvalho2017-02-202-2/+2
| | | | | |
| * | | | | Accept extra positional arguments in toxRodolfo Carvalho2017-02-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: tox -e py35-ansible22-unit -- --collect-only
| * | | | | Replace nose with pytest (utils)Rodolfo Carvalho2017-02-206-17/+42
| | | | | |
| * | | | | Clean up utils/README.mdRodolfo Carvalho2017-02-201-25/+16
| | | | | | | | | | | | | | | | | | | | | | | | Remove old way of running tests, plus mirror edits.
| * | | | | Replace nose with pytestRodolfo Carvalho2017-02-203-16/+1
| | | | | |
| * | | | | Extract assertion common to all tests as functionRodolfo Carvalho2017-02-202-56/+24
| | | | | |
| * | | | | Replace nose yield-style tests w/ pytest fixturesRodolfo Carvalho2017-02-203-248/+247
| | | | | |
| * | | | | Configure pytest to run tests and coverageRodolfo Carvalho2017-02-205-1/+42
| | | | | |
| * | | | | Make tests run with either nosetests or pytestRodolfo Carvalho2017-02-204-45/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 assertRodolfo Carvalho2017-02-202-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | In the intention to remove the dependency on nose and use only pytest.
| * | | | | Make usage of short_version/release consistentRodolfo Carvalho2017-02-202-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes irrelevant differences between the two test files, making it easier to observe similarities.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 17:40:53 +0000