Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #3402 from cgwalters/fedora-python3 | Scott Dodson | 2017-02-17 | 1 | -0/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | facts/main: Require Python 3 for Fedora, Python 2 everywhere else | Colin Walters | 2017-02-17 | 1 | -0/+12 | |
* | | | | | Merge pull request #3403 from kwoodson/lib_openshift_compat | Scott Dodson | 2017-02-17 | 14 | -14/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | String compatibility for python2,3 | Kenny Woodson | 2017-02-17 | 14 | -14/+14 | |
* | | | | | | Merge pull request #3404 from giuseppe/do-not-fail-on-grep | Scott Dodson | 2017-02-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | post_control_plane.yml: don't fail on grep | Giuseppe Scrivano | 2017-02-17 | 1 | -0/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3405 from sdodson/BZ1423430 | Scott Dodson | 2017-02-17 | 1 | -3/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix indenting/ordering in router cert redeploy | Scott Dodson | 2017-02-17 | 1 | -3/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3399 from mtnbikenc/deprecation | Russell Teague | 2017-02-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Resolve deprecation warning | Russell Teague | 2017-02-17 | 1 | -1/+1 | |
* | | | | | | Merge pull request #3369 from ashcrow/attach-cloudfront | Scott Dodson | 2017-02-17 | 3 | -11/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Register cloudfront privkey when required | Steve Milner | 2017-02-16 | 3 | -11/+25 | |
* | | | | | | | Merge pull request #3401 from sdodson/bz1423425 | Scott Dodson | 2017-02-17 | 4 | -2/+4 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix typo, add symlinks for roles | Scott Dodson | 2017-02-17 | 4 | -2/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3398 from dgoodwin/revert-upgrade-hack | Scott Dodson | 2017-02-17 | 1 | -9/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert temporary hack to skip router/registry upgrade. | Devan Goodwin | 2017-02-17 | 1 | -9/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3395 from sdodson/ruamel-yaml-atomic | Scott Dodson | 2017-02-16 | 2 | -0/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Don't attempt to install python-ruamel-yaml on atomic | Scott Dodson | 2017-02-16 | 2 | -0/+12 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3383 from kwoodson/yedit_yaml_support | Scott Dodson | 2017-02-16 | 21 | -315/+929 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Pleasing the linting gods. | Kenny Woodson | 2017-02-16 | 19 | -81/+213 | |
| * | | | | | | Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load. | Kenny Woodson | 2017-02-16 | 18 | -95/+297 | |
| * | | | | | | Adding fallback support for pyyaml. | Kenny Woodson | 2017-02-16 | 18 | -205/+485 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #3386 from bparees/bump_templates | Scott Dodson | 2017-02-16 | 9 | -10/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | update example templates+imagestreams | Ben Parees | 2017-02-16 | 9 | -10/+37 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3370 from adbaldi/work | Scott Dodson | 2017-02-16 | 4 | -4/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging) | Andrew Baldi | 2017-02-15 | 4 | -4/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3381 from jcantrill/bz_1420217_default_es_memory | Eric Wolinetz | 2017-02-16 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | bug 1420217. Default ES memory to be compariable to 3.4 deployer | Jeff Cantrill | 2017-02-16 | 1 | -2/+2 | |
* | | | | | Merge pull request #3374 from mwringe/hawkular-metrics-certificates | Scott Dodson | 2017-02-16 | 2 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add missing full hostname for the Hawkular Metrics certificate (BZ1421060) | mwringe | 2017-02-15 | 2 | -2/+2 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #3375 from abutcher/revert-openshift-facts-skip | Scott Dodson | 2017-02-16 | 1 | -60/+46 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Add block+when skip to `openshift_facts` tasks" | Andrew Butcher | 2017-02-15 | 1 | -60/+46 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3373 from ewolinetz/logging_fix_kibana_routes | Scott Dodson | 2017-02-16 | 4 | -6/+6 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | adding some quotes for safety | ewolinetz | 2017-02-15 | 1 | -1/+1 | |
| * | | | | fixing use of oc_scale module | ewolinetz | 2017-02-15 | 2 | -2/+2 | |
| * | | | | fixing default for logging | ewolinetz | 2017-02-15 | 1 | -3/+3 | |
| |/ / / | ||||||
* | | | | Merge pull request #3380 from ingvagabund/initialize-nodes-to-upgrade-when-ru... | Scott Dodson | 2017-02-16 | 3 | -0/+9 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | initialize oo_nodes_to_upgrade group when running control plane upgrade only | Jan Chaloupka | 2017-02-16 | 3 | -0/+9 | |
|/ / / | ||||||
* | | | Merge pull request #3371 from detiber/fixLint | Scott Dodson | 2017-02-15 | 1 | -1/+0 | |
|\ \ \ | ||||||
| * | | | Fix some lint | Jason DeTiberus | 2017-02-15 | 1 | -1/+0 | |
|/ / / | ||||||
* | | | Merge pull request #3364 from detiber/lintCleanup | Scott Dodson | 2017-02-15 | 5 | -8/+18 | |
|\ \ \ | ||||||
| * | | | Ansible Lint cleanup and making filter/lookup plugins used by openshift_maste... | Jason DeTiberus | 2017-02-14 | 5 | -8/+18 | |
* | | | | Merge pull request #3367 from soltysh/upgrade_jobs | Scott Dodson | 2017-02-15 | 3 | -0/+23 | |
|\ \ \ \ | ||||||
| * | | | | Add upgrade job step after the entire upgrade performs | Maciej Szulik | 2017-02-15 | 3 | -0/+23 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #3368 from ingvagabund/fix-path-to-disabled-exclude-in-34-... | Jan Chaloupka | 2017-02-15 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | upgrades: fix path to disable_excluder.yml | Jan Chaloupka | 2017-02-15 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #3332 from giuseppe/system-containers-ha | Giuseppe Scrivano | 2017-02-15 | 7 | -13/+81 | |
|\ \ \ | ||||||
| * | | | node, vars/main.yml: define l_is_ha and l_is_same_version | Giuseppe Scrivano | 2017-02-14 | 3 | -10/+10 | |
| * | | | master, vars/main.yml: define l_is_ha and l_is_same_version | Giuseppe Scrivano | 2017-02-14 | 2 | -12/+15 | |
| * | | | node: simplify when conditionals | Giuseppe Scrivano | 2017-02-10 | 1 | -2/+5 |