summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3447 from kwoodson/router_no_default_certKenny Woodson2017-02-225-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 Woodson2017-02-225-12/+20
| |
| * if no key, cert, cacert, or default_cert is passed then do not pass to ocKenny Woodson2017-02-213-4/+22
| |
* | Merge pull request #3454 from ewolinetz/logging_tag_master_configScott Dodson2017-02-221-0/+2
|\ \ | | | | | | adding tag to update_master_config
| * | adding tag to update_master_configewolinetz2017-02-221-0/+2
| |/
* / CloudFront oc_secret contents should be a listSteve Milner2017-02-221-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_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
| | | |
* | | | Fix typoRodolfo Carvalho2017-02-211-1/+1
| |/ / |/| |
* | | 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 #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-204-332/+271
|\ \ \ \ | | | | | | | | | | Migrate from nose to pytest
| * | | | 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
| | | | |
| * | | | Make tests run with either nosetests or pytestRodolfo Carvalho2017-02-203-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 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.
| * | | | Reorganize tests and helper functions logicallyRodolfo Carvalho2017-02-202-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 duplicationRodolfo Carvalho2017-02-203-80/+60
| | | | | | | | | | | | | | | | | | | | | | | | | Consolidate tests for bad input into a single file instead of having the same code in two files.
| * | | | Move similar test cases togetherRodolfo Carvalho2017-02-202-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.pathRodolfo Carvalho2017-02-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/a/10097543/4804690 Additionally, avoid using platform-specific '/' and '..'.
| * | | | Rename test for consistencyRodolfo Carvalho2017-02-201-1/+1
| | | | |
* | | | | Fix validation of generated codeRodolfo Carvalho2017-02-201-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-playbooksRussell Teague2017-02-201-16/+21
|\ \ \ \ | | | | | | | | | | Updating node playbooks to use oc_obj