summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3426 from rhcarvalho/fix-code-gen-validationJason DeTiberus2017-02-202-1/+3
|\ | | | | Fix validation of generated code
| * Fix validation of generated codeRodolfo Carvalho2017-02-202-1/+3
|/ | | | | 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-202-21/+36
|\ | | | | Updating node playbooks to use oc_obj
| * Updating node playbooks to use oc_objRussell Teague2017-02-172-21/+36
| |
* | 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
| | |
* | | Merge pull request #3425 from ingvagabund/fix-symlink-to-filters-in-spec-fileScott Dodson2017-02-201-0/+4
|\ \ \ | | | | | | | | Fix symlink to filter_plugins/oo_filters.py
| * | | Fix symlink to filter_plugins/oo_filters.pyJan Chaloupka2017-02-201-0/+4
|/ / / | | | | | | | | | Bug 1423444
* | | Merge pull request #3414 from rhcarvalho/fix-missing-unit-tests-ciRodolfo Carvalho2017-02-1917-4/+9
|\ \ \ | | | | | | | | Fix missing unit tests in CI
| * | | Temporarily lower the bar for minimum coverageRodolfo Carvalho2017-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | Running tests from `roles/lib_openshift` and `roles/lib_utils` uncovers the current lower coverage. Need to fix that and raise the bar again.
| * | | Unset exec bit in tests, add missing requirementsJason DeTiberus2017-02-1916-1/+2
| | | | | | | | | | | | | | | | was: separate lib_ unit tests from other unit tests
| * | | Include missing unit tests to test runner configRodolfo Carvalho2017-02-1914-1/+5
| | | | | | | | | | | | | | | | 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 #3418 from rhcarvalho/dead-codeRodolfo Carvalho2017-02-192-35/+0
|\ \ \ \ | |/ / / |/| | | Remove dead code in installer
| * | | Remove dead code in installerRodolfo Carvalho2017-02-192-35/+0
|/ / / | | | | | | | | | | | | Found using `vulture`, confirmed that code that was once used became unused in later commits after its introduction.
* | | Merge pull request #3412 from rhcarvalho/dead-codeRodolfo Carvalho2017-02-193-34/+14
|\ \ \ | | | | | | | | Remove and document how to find dead Python code
| * | | Remove dead codeRodolfo Carvalho2017-02-182-34/+0
| | | |
| * | | Document how to find dead Python codeRodolfo Carvalho2017-02-181-0/+14
| | | |
* | | | 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 #3404 from giuseppe/do-not-fail-on-grepScott Dodson2017-02-171-0/+1
|\ \ \ \ | | | | | | | | | | post_control_plane.yml: don't fail on grep
| * | | | post_control_plane.yml: don't fail on grepGiuseppe Scrivano2017-02-171-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | grep returns rc != 0 if the text is not found, the next rule assumes that. Do not fail on the check when the line is not found. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3405 from sdodson/BZ1423430Scott Dodson2017-02-171-3/+2
|\ \ \ \ | | | | | | | | | | Fix indenting/ordering in router cert redeploy
| * | | | Fix indenting/ordering in router cert redeployScott Dodson2017-02-171-3/+2
| |/ / / | | | | | | | | | | | | Fixes Bug 1423430
* | | | 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
| | | | |
* | | | | Merge pull request #3401 from sdodson/bz1423425Scott Dodson2017-02-174-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Fix typo and missing links to roles
| * | | | Fix typo, add symlinks for rolesScott Dodson2017-02-174-2/+4
|/ / / / | | | | | | | | | | | | Fixes Bug 1423425
* | | | Merge pull request #3398 from dgoodwin/revert-upgrade-hackScott Dodson2017-02-171-9/+0
|\ \ \ \ | | | | | | | | | | Revert temporary hack to skip router/registry upgrade.
| * | | | Revert temporary hack to skip router/registry upgrade.Devan Goodwin2017-02-171-9/+0
|/ / / /
* | | | Merge pull request #3395 from sdodson/ruamel-yaml-atomicScott Dodson2017-02-162-0/+12
|\ \ \ \ | | | | | | | | | | Don't attempt to install python-ruamel-yaml on atomic
| * | | | 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
| | | | |
| * | | | Adding fallback support for pyyaml.Kenny Woodson2017-02-1618-205/+485
| | |/ / | |/| |
* | | | Merge pull request #3386 from bparees/bump_templatesScott Dodson2017-02-169-10/+37
|\ \ \ \ | | | | | | | | | | update example templates+imagestreams
| * | | | update example templates+imagestreamsBen Parees2017-02-169-10/+37
| |/ / /
* | | | Merge pull request #3370 from adbaldi/workScott Dodson2017-02-164-4/+4
|\ \ \ \ | |/ / / |/| | | Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging)
| * | | Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging)Andrew Baldi2017-02-154-4/+4
| |/ /
* | | Merge pull request #3381 from jcantrill/bz_1420217_default_es_memoryEric Wolinetz2017-02-161-2/+2
|\ \ \ | | | | | | | | bug 1420217. Default ES memory to be compariable to 3.4 deployer
| * | | bug 1420217. Default ES memory to be compariable to 3.4 deployerJeff Cantrill2017-02-161-2/+2
| | | |
* | | | Merge pull request #3374 from mwringe/hawkular-metrics-certificatesScott Dodson2017-02-162-2/+2
|\ \ \ \ | | | | | | | | | | Fix issues with Hawkular Metrics certificates