Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3076 from ashcrow/flatten-oo-filters | Jason DeTiberus | 2017-01-11 | 1 | -896/+898 |
|\ | | | | | WIP: oo_filters: Moved static methods to functions | ||||
| * | oo_filters: Moved static methods to functions | Steve Milner | 2017-01-11 | 1 | -896/+898 |
| | | | | | | | | | | This change moves the static methods into functions in an effort to reduce complexity and improve readability. | ||||
* | | Merge pull request #3079 from tbielawa/readme_release_docs | Jason DeTiberus | 2017-01-11 | 1 | -22/+40 |
|\ \ | | | | | | | first swing at release version wording | ||||
| * | | first swing at release version wording | Tim Bielawa | 2017-01-11 | 1 | -22/+40 |
|/ / | | | | | | | clarify our branching and release compat. policy. | ||||
* | | Merge pull request #3030 from kwoodson/yaml_editor | Scott Dodson | 2017-01-11 | 11 | -0/+2118 |
|\ \ | | | | | | | Ansible module for modifying yaml idempotently. | ||||
| * | | Adding ability to systematically modify yaml from ansible. | Kenny Woodson | 2017-01-11 | 11 | -0/+2118 |
| |/ | |||||
* | | Merge pull request #3074 from tbielawa/GH3070-drainuate | Scott Dodson | 2017-01-11 | 5 | -3/+20 |
|\ \ | | | | | | | Add a fact to select --evacuate or --drain based on your OCP version | ||||
| * | | Add a fact to select --evacuate or --drain based on your OCP version | Tim Bielawa | 2017-01-11 | 5 | -3/+20 |
| | | | | | | | | | | | | Closes #3070 | ||||
* | | | Merge pull request #3077 from mtnbikenc/fix-tox | Jason DeTiberus | 2017-01-11 | 1 | -2/+1 |
|\ \ \ | |_|/ |/| | | Correct tox to run on Travis | ||||
| * | | Correct tox to run on Travis | Russell Teague | 2017-01-11 | 1 | -2/+1 |
|/ / | |||||
* | | Merge pull request #3075 from mtnbikenc/fix-yamllint-check | Jason DeTiberus | 2017-01-11 | 1 | -5/+5 |
|\ \ | | | | | | | [WIP] Correct return code compairison for yamllint | ||||
| * | | Correct return code compairison for yamllint | Russell Teague | 2017-01-11 | 1 | -5/+5 |
| | | | |||||
* | | | Merge pull request #3073 from sdodson/branches | Scott Dodson | 2017-01-11 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Update branch status | ||||
| * | | Update branch status | Scott Dodson | 2017-01-11 | 1 | -1/+1 |
|/ / | | | | | | | master is now applicable to v1.5 and v1.4 | ||||
* | | Merge pull request #2881 from jcantrill/mv_metrics_to_hosted_metrics | Jason DeTiberus | 2017-01-11 | 8 | -17/+17 |
|\ \ | | | | | | | rename openshift_metrics to openshift_hosted_metrics | ||||
| * | | rename openshift_metrics to openshift_hosted_metrics | Jeff Cantrill | 2017-01-11 | 8 | -17/+17 |
| |/ | |||||
* | | Merge pull request #3067 from lhuard1A/update_ec2_inventory | Jason DeTiberus | 2017-01-11 | 2 | -59/+280 |
|\ \ | | | | | | | Update aws dynamic inventory | ||||
| * | | Update aws dynamic inventory | Lénaïc Huard | 2017-01-10 | 2 | -59/+280 |
| | | | | | | | | | | | | Fetch from https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/ec2.py | ||||
* | | | Merge pull request #3072 from lhuard1A/update_gce_inventory | Jason DeTiberus | 2017-01-11 | 1 | -38/+214 |
|\ \ \ | | | | | | | | | Update gce dynamic inventory | ||||
| * | | | Update aws dynamic inventory | Lénaïc Huard | 2017-01-11 | 1 | -38/+214 |
| | |/ | |/| | | | | | | | Fetch from https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/gce.py | ||||
* | | | Merge pull request #3071 from ashcrow/remove-print-from-tests | Jason DeTiberus | 2017-01-11 | 2 | -2/+0 |
|\ \ \ | | | | | | | | | cleanup: Removed debug prints from tests | ||||
| * | | | cleanup: Removed debug prints from tests | Steve Milner | 2017-01-11 | 2 | -2/+0 |
| |/ / | |||||
* | | | Merge pull request #3069 from openshift/issue-template | Scott Dodson | 2017-01-11 | 1 | -9/+22 |
|\ \ \ | |/ / |/| | | improve issue template | ||||
| * | | improve issue template | Scott Dodson | 2017-01-11 | 1 | -9/+22 |
| | | | |||||
* | | | Merge pull request #3066 from detiber/toxification | Scott Dodson | 2017-01-10 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | remove debug statement from test | ||||
| * | | | remove debug statement from test | Jason DeTiberus | 2017-01-10 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #3007 from detiber/toxification | Scott Dodson | 2017-01-10 | 25 | -378/+541 |
|\ \ \ | | | | | | | | | More Toxification | ||||
| * | | | increase test coverage | Jason DeTiberus | 2017-01-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | update travis to use tox for utils | Jason DeTiberus | 2017-01-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | More toxification | Jason DeTiberus | 2017-01-10 | 24 | -377/+467 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move pylint tests to tox - Move yamllint tests to tox - Create separate tox config (and setup.py) for root - bump ansible requirement - unify pylint config - add docs - remove git directory containing old testing tools - install python-six if not present for openshift-facts - add python-six as a dependency for openshift-ansible-utils | ||||
| * | | | add test for utils to bump coverage | Jason DeTiberus | 2017-01-10 | 1 | -0/+73 |
| | |/ | |/| | |||||
* | | | Merge pull request #3065 from ashcrow/rpmrebuilddb | Andrew Butcher | 2017-01-10 | 1 | -0/+12 |
|\ \ \ | | | | | | | | | Workaround for dnf+docker version race condition | ||||
| * | | | Workaround for dnf+docker version race condition | Steve Milner | 2017-01-10 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some versions of dnf the rpm database can require maintenance after usage. Unfortunately, this trips up get_version_output in the openshift_facts library as the maintenance may interrupt the STDOUT stream. This makes the resulting data returned from get_version_output malformed and unparsable. This change adds an rpm --rebuilddb command before requesting docker version output when the ansible package manager is dnf. This causes the STDOUT maintenance messages to no longer interrupt the expected yaml stream as well as releases locks in the rpm database. | ||||
* | | | | Merge pull request #3060 from abutcher/return-deps-to-roles | Scott Dodson | 2017-01-10 | 6 | -98/+78 |
|\ \ \ \ | | | | | | | | | | | Return role dependencies to roles for openshift_{hosted,master,node} | ||||
| * | | | | Move role dependencies out of playbooks for openshift_master, openshift_node ↵ | Andrew Butcher | 2017-01-09 | 6 | -98/+78 |
| | | | | | | | | | | | | | | | | | | | | and openshift_hosted. | ||||
* | | | | | Merge pull request #2975 from sjug/soft-reset | Jason DeTiberus | 2017-01-10 | 1 | -97/+177 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Partial uninstall functionality | ||||
| * | | | | Partial uninstall | Sebastian Jug | 2017-01-10 | 1 | -97/+177 |
|/ / / / | |||||
* | | | | Merge pull request #3056 from rhcarvalho/cleanup-cluster-upgrade | Rodolfo Carvalho | 2017-01-10 | 3 | -206/+1 |
|\ \ \ \ | | | | | | | | | | | Cleanup cluster upgrade | ||||
| * | | | | Remove unused file | Rodolfo Carvalho | 2017-01-09 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | All references to it were removed in b89c835e3235f2628b37de15713c311d1b5a4bad | ||||
| * | | | | Remove unused file | Rodolfo Carvalho | 2017-01-09 | 1 | -193/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | All references to it were removed in 739ad9de2a11bb8c67d77641a86cfd39e4594542 | ||||
| * | | | | Remove spurious argument | Rodolfo Carvalho | 2017-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script nuke_images.sh was introduced in 0c31d72be3bf32f848eedad9859a81ba858f8c8f and seems that the shell argument $1 was never used (the only $1 in the script back then refers to a field in a awk script). There was a reference to $2 that was always undefined/empty. The script was then simplified in b89c835e3235f2628b37de15713c311d1b5a4bad, removing any reference to $1 and $2. This commit cleans up the only call site to the shell script. | ||||
* | | | | | Merge pull request #3061 from tbielawa/scaleup-bz1390135 | Scott Dodson | 2017-01-09 | 1 | -0/+14 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | The scaleup subcommand does not support the unattended option | ||||
| * | | | | The scaleup subcommand does not support the unattended option | Tim Bielawa | 2017-01-09 | 1 | -0/+14 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | * 'atomic-openshift-installer' will exit now if -u is given with the 'scaleup' subcommand * https://bugzilla.redhat.com/show_bug.cgi?id=1390135 | ||||
* | | | | Automatic commit of package [openshift-ansible] release [3.5.0-1]. | Scott Dodson | 2017-01-09 | 3 | -2/+235 |
| | | | | |||||
* | | | | Merge pull request #3055 from abutcher/openshift_image_tag=latest | Scott Dodson | 2017-01-09 | 3 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | Fix openshift_image_tag=latest. | ||||
| * | | | | Fix openshift_image_tag=latest. | Andrew Butcher | 2017-01-09 | 3 | -6/+7 |
| |/ / / | |||||
* | | | | Merge pull request #3021 from tbielawa/fix_aoi_man | Tim Bielawa | 2017-01-09 | 3 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | Update aoi manpage with correct operation count | ||||
| * | | | | Update manpage version. | Tim Bielawa | 2017-01-09 | 2 | -3/+4 |
| | | | | | |||||
| * | | | | Update aoi manpage with correct operation count | Tim Bielawa | 2016-12-28 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #2909 from mtnbikenc/firewalld | Scott Dodson | 2017-01-09 | 5 | -18/+26 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Enable firewalld by default |