summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* bug 1425321. Default the master api port based on the factsJeff Cantrill2017-02-212-2/+2
|
* 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
| * | | | Updating node playbooks to use oc_objRussell Teague2017-02-171-16/+21
| | |/ / | |/| |
* | | | Merge pull request #3340 from etsauer/scale-routerScott Dodson2017-02-201-0/+24
|\ \ \ \ | |_|/ / |/| | | Making router pods scale with infra nodes
| * | | Removing trailing spacesEric Sauer2017-02-131-2/+2
| | | |
| * | | Making router pods scale with infra nodesEric Sauer2017-02-101-0/+24
| | | |
* | | | Unset exec bit in tests, add missing requirementsJason DeTiberus2017-02-1913-0/+0
| | | | | | | | | | | | | | | | was: separate lib_ unit tests from other unit tests
* | | | Include missing unit tests to test runner configRodolfo Carvalho2017-02-1913-0/+0
| | | | | | | | | | | | | | | | We were not running those tests in CI, bad :(
* | | | Fix tests on Python 3Rodolfo Carvalho2017-02-192-2/+2
| |_|/ |/| | | | | | | | | | | | | | Unlike in Python 2: - `range` doesn't return a list. - `dict.keys` doesn't return a list.
* | | Merge pull request #3412 from rhcarvalho/dead-codeRodolfo Carvalho2017-02-192-34/+0
|\ \ \ | | | | | | | | Remove and document how to find dead Python code
| * | | Remove dead codeRodolfo Carvalho2017-02-182-34/+0
| | | |
* | | | Merge pull request #3411 from kwoodson/oc_route_remove_debugKenny Woodson2017-02-182-2/+2
|\ \ \ \ | |/ / / |/| | | Fixing a bug by removing default debug output.
| * | | Fixing a bug by removing default debugKenny Woodson2017-02-172-2/+2
| | |/ | |/|
* | | Merge pull request #3402 from cgwalters/fedora-python3Scott Dodson2017-02-171-0/+12
|\ \ \ | |/ / |/| | facts/main: Require Python 3 for Fedora, Python 2 everywhere else
| * | facts/main: Require Python 3 for Fedora, Python 2 everywhere elseColin Walters2017-02-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a few reasons; among them that we currently have a dependency on `PyYAML` which on Fedora Atomic Host isn't installed for Python 2 by default. Further, many dependencies are being ported in Fedora to be Python 3. Conversely, ensure that we're using Python 2 everywhere else (which is really CentOS/RHEL), since AFAIK we don't test that path at all, and we really don't need *more* entries in the supported matrix.
* | | Merge pull request #3403 from kwoodson/lib_openshift_compatScott Dodson2017-02-1714-14/+14
|\ \ \ | | | | | | | | Compatibility for python2,3.
| * | | String compatibility for python2,3Kenny Woodson2017-02-1714-14/+14
| | | |
* | | | Merge pull request #3399 from mtnbikenc/deprecationRussell Teague2017-02-171-1/+1
|\ \ \ \ | |/ / / |/| | | Resolve deprecation warning
| * | | Resolve deprecation warningRussell Teague2017-02-171-1/+1
| | | |
* | | | Merge pull request #3369 from ashcrow/attach-cloudfrontScott Dodson2017-02-173-11/+25
|\ \ \ \ | |/ / / |/| | | WIP: Register cloudfront privkey when required
| * | | Register cloudfront privkey when requiredSteve Milner2017-02-163-11/+25
| | | |
* | | | Don't attempt to install python-ruamel-yaml on atomicScott Dodson2017-02-162-0/+12
| | | |
* | | | Merge pull request #3383 from kwoodson/yedit_yaml_supportScott Dodson2017-02-1621-315/+929
|\ \ \ \ | | | | | | | | | | Adding fallback support for pyyaml.
| * | | | Pleasing the linting gods.Kenny Woodson2017-02-1619-81/+213
| | | | |
| * | | | Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load.Kenny Woodson2017-02-1618-95/+297
| | | | |