summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Add missing full hostname for the Hawkular Metrics certificate (BZ1421060)mwringe2017-02-152-2/+2
| | | | | | | | | | | | | | | | Fix issue where the signer certificate's name is static, preventing redeployments from being acceptable.
* | | | Merge pull request #3375 from abutcher/revert-openshift-facts-skipScott Dodson2017-02-161-60/+46
|\ \ \ \ | | | | | | | | | | Revert "Add block+when skip to `openshift_facts` tasks"
| * | | | Revert "Add block+when skip to `openshift_facts` tasks"Andrew Butcher2017-02-151-60/+46
| |/ / / | | | | | | | | | | | | This reverts commit 0b1c1c2c524bfb932ab0e15f63f464673c00e651.
* | | | Merge pull request #3373 from ewolinetz/logging_fix_kibana_routesScott Dodson2017-02-164-6/+6
|\ \ \ \ | |_|/ / |/| | | Fixing default for logging
| * | | adding some quotes for safetyewolinetz2017-02-151-1/+1
| | | |
| * | | fixing use of oc_scale moduleewolinetz2017-02-152-2/+2
| | | |
| * | | fixing default for loggingewolinetz2017-02-151-3/+3
| |/ /
* | | Merge pull request #3380 from ↵Scott Dodson2017-02-163-0/+9
|\ \ \ | |/ / |/| | | | | | | | ingvagabund/initialize-nodes-to-upgrade-when-running-control-plane-upgrade-only initialize oo_nodes_to_upgrade group when running control plane upgrade only
| * | initialize oo_nodes_to_upgrade group when running control plane upgrade onlyJan Chaloupka2017-02-163-0/+9
|/ /
* | Merge pull request #3371 from detiber/fixLintScott Dodson2017-02-151-1/+0
|\ \ | | | | | | Fix some lint
| * | Fix some lintJason DeTiberus2017-02-151-1/+0
|/ /
* | Merge pull request #3364 from detiber/lintCleanupScott Dodson2017-02-155-8/+18
|\ \ | | | | | | Ansible Lint cleanup and making filter/lookup plugins used by openshift_master_facts available within the role
| * | Ansible Lint cleanup and making filter/lookup plugins used by ↵Jason DeTiberus2017-02-145-8/+18
| | | | | | | | | | | | openshift_master_facts available within the role
* | | Merge pull request #3367 from soltysh/upgrade_jobsScott Dodson2017-02-153-0/+23
|\ \ \ | | | | | | | | Add upgrade job step after the entire upgrade performs
| * | | Add upgrade job step after the entire upgrade performsMaciej Szulik2017-02-153-0/+23
| | |/ | |/|
* | | Merge pull request #3368 from ↵Jan Chaloupka2017-02-151-1/+1
|\ \ \ | |/ / |/| | | | | | | | ingvagabund/fix-path-to-disabled-exclude-in-34-node-upgrade upgrades: fix path to disable_excluder.yml
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:32:02 +0000