Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3401 from sdodson/bz1423425 | Scott Dodson | 2017-02-17 | 4 | -2/+4 |
|\ | | | | | Fix typo and missing links to roles | ||||
| * | Fix typo, add symlinks for roles | Scott Dodson | 2017-02-17 | 4 | -2/+4 |
|/ | | | | Fixes Bug 1423425 | ||||
* | 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. | ||||
| * | 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 | ||||
| * | 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 |
|\ | | | | | Adding fallback support for pyyaml. | ||||
| * | 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 | ||||
| * | | 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) | ||||
| * | 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 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Fix issues with Hawkular Metrics certificates | ||||
| * | | | Add missing full hostname for the Hawkular Metrics certificate (BZ1421060) | mwringe | 2017-02-15 | 2 | -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-skip | Scott Dodson | 2017-02-16 | 1 | -60/+46 |
|\ \ \ \ | | | | | | | | | | | Revert "Add block+when skip to `openshift_facts` tasks" | ||||
| * | | | | Revert "Add block+when skip to `openshift_facts` tasks" | Andrew Butcher | 2017-02-15 | 1 | -60/+46 |
| |/ / / | | | | | | | | | | | | | This reverts commit 0b1c1c2c524bfb932ab0e15f63f464673c00e651. | ||||
* | | | | Merge pull request #3373 from ewolinetz/logging_fix_kibana_routes | Scott Dodson | 2017-02-16 | 4 | -6/+6 |
|\ \ \ \ | |_|/ / |/| | | | Fixing default for logging | ||||
| * | | | 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 ↵ | Scott Dodson | 2017-02-16 | 3 | -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 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 | ||||
| * | | 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_master_facts available within the role | ||||
| * | | Ansible Lint cleanup and making filter/lookup plugins used by ↵ | Jason DeTiberus | 2017-02-14 | 5 | -8/+18 |
| | | | | | | | | | | | | openshift_master_facts available within the role | ||||
* | | | 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 | ||||
| * | | | Add upgrade job step after the entire upgrade performs | Maciej Szulik | 2017-02-15 | 3 | -0/+23 |
| | |/ | |/| | |||||
* | | | Merge pull request #3368 from ↵ | Jan Chaloupka | 2017-02-15 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | ingvagabund/fix-path-to-disabled-exclude-in-34-node-upgrade upgrades: fix path to disable_excluder.yml | ||||
| * | | 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 |
|\ \ | | | | | | | system containers: add support for HA deployments | ||||
| * | | node, vars/main.yml: define l_is_ha and l_is_same_version | Giuseppe Scrivano | 2017-02-14 | 3 | -10/+10 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | master, vars/main.yml: define l_is_ha and l_is_same_version | Giuseppe Scrivano | 2017-02-14 | 2 | -12/+15 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | node: simplify when conditionals | Giuseppe Scrivano | 2017-02-10 | 1 | -2/+5 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | openvswitch: simplify when conditionals | Giuseppe Scrivano | 2017-02-10 | 1 | -4/+5 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | uninstall: delete master-api and master-controllers | Giuseppe Scrivano | 2017-02-10 | 1 | -0/+16 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | master: support HA deployments with system containers | Giuseppe Scrivano | 2017-02-10 | 2 | -2/+47 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | Merge pull request #3362 from ashcrow/1421033 | Scott Dodson | 2017-02-14 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Update variant_version | ||||
| * | | | Update variant_version | Steve Milner | 2017-02-14 | 1 | -1/+2 |
|/ / / | | | | | | | | | | 3.5 added and 3.4 moved to LEGACY | ||||
* | | | Merge pull request #3350 from mwringe/bz1421860 | Scott Dodson | 2017-02-14 | 2 | -4/+4 |
|\ \ \ | |_|/ |/| | | BZ1421860: increase Heapster's metric resolution to 30s | ||||
| * | | BZ1421860: increase Heapster's metric resolution to 30s | mwringe | 2017-02-13 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #3351 from detiber/fixConfigClobber | Jason DeTiberus | 2017-02-14 | 22 | -66/+22 |
|\ \ \ | | | | | | | | | Fix cases where child classes override OpenShiftCLI values | ||||
| * | | | Fix cases where child classes override OpenShiftCLI values | Jason DeTiberus | 2017-02-13 | 22 | -66/+22 |
| |/ / | |||||
* | | | Merge pull request #3355 from tbielawa/idempotency_please_work | Scott Dodson | 2017-02-14 | 7 | -46/+100 |
|\ \ \ | | | | | | | | | Idempotency please work | ||||
| * | | | Add block+when skip to `openshift_facts` tasks | Tim Bielawa | 2017-02-14 | 1 | -46/+58 |
| | | | | | | | | | | | | | | | | | | | | * Speed improvements as a side-effect of skipping the tasks in future includes of `openshift_facts` | ||||
| * | | | Trying to fix up/audit note some changes | Tim Bielawa | 2017-02-14 | 6 | -0/+42 |
| | | | |