Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3412 from rhcarvalho/dead-code | Rodolfo Carvalho | 2017-02-19 | 2 | -34/+0 |
|\ | | | | | Remove and document how to find dead Python code | ||||
| * | Remove dead code | Rodolfo Carvalho | 2017-02-18 | 2 | -34/+0 |
| | | |||||
* | | Merge pull request #3411 from kwoodson/oc_route_remove_debug | Kenny Woodson | 2017-02-18 | 2 | -2/+2 |
|\ \ | |/ |/| | Fixing a bug by removing default debug output. | ||||
| * | Fixing a bug by removing default debug | Kenny Woodson | 2017-02-17 | 2 | -2/+2 |
| | | |||||
* | | 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 | ||||
| * | facts/main: Require Python 3 for Fedora, Python 2 everywhere else | Colin Walters | 2017-02-17 | 1 | -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_compat | Scott Dodson | 2017-02-17 | 14 | -14/+14 |
|\ \ | | | | | | | Compatibility for python2,3. | ||||
| * | | String compatibility for python2,3 | Kenny Woodson | 2017-02-17 | 14 | -14/+14 |
| | | | |||||
* | | | Merge pull request #3399 from mtnbikenc/deprecation | Russell Teague | 2017-02-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Resolve deprecation warning | ||||
| * | | 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 |
|\ \ \ | |/ / |/| | | WIP: Register cloudfront privkey when required | ||||
| * | | Register cloudfront privkey when required | Steve Milner | 2017-02-16 | 3 | -11/+25 |
| | | | |||||
* | | | 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 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | 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 | 1 | -1/+1 |
| |/ | |||||
* | | 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. | ||||
* | | | 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 #3364 from detiber/lintCleanup | Scott Dodson | 2017-02-15 | 5 | -8/+596 |
|\ \ | |/ |/| | 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/+596 |
| | | | | | | | | openshift_master_facts available within the role | ||||
* | | Merge pull request #3332 from giuseppe/system-containers-ha | Giuseppe Scrivano | 2017-02-15 | 6 | -13/+65 |
|\ \ | | | | | | | 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> | ||||
| * | | 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 #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 | 4 | -46/+73 |
|\ \ \ | | | | | | | | | 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 | 3 | -0/+15 |
| | | | | |||||
* | | | | Merge pull request #3359 from ewolinetz/logging_metrics_defaults | Scott Dodson | 2017-02-14 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | updating defaults for logging and metrics roles | ||||
| * | | | | updating defaults for logging and metrics roles | ewolinetz | 2017-02-14 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3308 from mtnbikenc/oc_label | Russell Teague | 2017-02-14 | 4 | -65/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | Modify playbooks to use oc_label module | ||||
| * | | | | Modify playbooks to use oc_label module | Russell Teague | 2017-02-14 | 4 | -77/+10 |
| | | | | | |||||
* | | | | | Merge pull request #3342 from mtnbikenc/oc_obj | Russell Teague | 2017-02-14 | 4 | -100/+127 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Modify playbooks to use oc_obj module |