summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3074 from tbielawa/GH3070-drainuateScott Dodson2017-01-115-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 versionTim Bielawa2017-01-115-3/+20
| | | | | | | | Closes #3070
* | Merge pull request #3077 from mtnbikenc/fix-toxJason DeTiberus2017-01-111-2/+1
|\ \ | | | | | | Correct tox to run on Travis
| * | Correct tox to run on TravisRussell Teague2017-01-111-2/+1
|/ /
* | Merge pull request #3075 from mtnbikenc/fix-yamllint-checkJason DeTiberus2017-01-111-5/+5
|\ \ | | | | | | [WIP] Correct return code compairison for yamllint
| * | Correct return code compairison for yamllintRussell Teague2017-01-111-5/+5
| | |
* | | Merge pull request #3073 from sdodson/branchesScott Dodson2017-01-111-1/+1
|\ \ \ | |_|/ |/| | Update branch status
| * | Update branch statusScott Dodson2017-01-111-1/+1
|/ / | | | | | | master is now applicable to v1.5 and v1.4
* | Merge pull request #2881 from jcantrill/mv_metrics_to_hosted_metricsJason DeTiberus2017-01-118-17/+17
|\ \ | | | | | | rename openshift_metrics to openshift_hosted_metrics
| * | rename openshift_metrics to openshift_hosted_metricsJeff Cantrill2017-01-118-17/+17
| |/
* | Merge pull request #3067 from lhuard1A/update_ec2_inventoryJason DeTiberus2017-01-112-59/+280
|\ \ | | | | | | Update aws dynamic inventory
| * | Update aws dynamic inventoryLénaïc Huard2017-01-102-59/+280
| | | | | | | | | | | | Fetch from https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/ec2.py
* | | Merge pull request #3072 from lhuard1A/update_gce_inventoryJason DeTiberus2017-01-111-38/+214
|\ \ \ | | | | | | | | Update gce dynamic inventory
| * | | Update aws dynamic inventoryLénaïc Huard2017-01-111-38/+214
| | |/ | |/| | | | | | | Fetch from https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/gce.py
* | | Merge pull request #3071 from ashcrow/remove-print-from-testsJason DeTiberus2017-01-112-2/+0
|\ \ \ | | | | | | | | cleanup: Removed debug prints from tests
| * | | cleanup: Removed debug prints from testsSteve Milner2017-01-112-2/+0
| |/ /
* | | Merge pull request #3069 from openshift/issue-templateScott Dodson2017-01-111-9/+22
|\ \ \ | |/ / |/| | improve issue template
| * | improve issue templateScott Dodson2017-01-111-9/+22
| | |
* | | Merge pull request #3066 from detiber/toxificationScott Dodson2017-01-101-1/+0
|\ \ \ | | | | | | | | remove debug statement from test
| * | | remove debug statement from testJason DeTiberus2017-01-101-1/+0
|/ / /
* | | Merge pull request #3007 from detiber/toxificationScott Dodson2017-01-1025-378/+541
|\ \ \ | | | | | | | | More Toxification
| * | | increase test coverageJason DeTiberus2017-01-101-1/+1
| | | |
| * | | update travis to use tox for utilsJason DeTiberus2017-01-101-1/+1
| | | |
| * | | More toxificationJason DeTiberus2017-01-1024-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 coverageJason DeTiberus2017-01-101-0/+73
| | |/ | |/|
* | | Merge pull request #3065 from ashcrow/rpmrebuilddbAndrew Butcher2017-01-101-0/+12
|\ \ \ | | | | | | | | Workaround for dnf+docker version race condition
| * | | Workaround for dnf+docker version race conditionSteve Milner2017-01-101-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-rolesScott Dodson2017-01-106-98/+78
|\ \ \ \ | | | | | | | | | | Return role dependencies to roles for openshift_{hosted,master,node}
| * | | | Move role dependencies out of playbooks for openshift_master, openshift_node ↵Andrew Butcher2017-01-096-98/+78
| | | | | | | | | | | | | | | | | | | | and openshift_hosted.
* | | | | Merge pull request #2975 from sjug/soft-resetJason DeTiberus2017-01-101-97/+177
|\ \ \ \ \ | |_|_|/ / |/| | | | Partial uninstall functionality
| * | | | Partial uninstallSebastian Jug2017-01-101-97/+177
|/ / / /
* | | | Merge pull request #3056 from rhcarvalho/cleanup-cluster-upgradeRodolfo Carvalho2017-01-103-206/+1
|\ \ \ \ | | | | | | | | | | Cleanup cluster upgrade
| * | | | Remove unused fileRodolfo Carvalho2017-01-091-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | All references to it were removed in b89c835e3235f2628b37de15713c311d1b5a4bad
| * | | | Remove unused fileRodolfo Carvalho2017-01-091-193/+0
| | | | | | | | | | | | | | | | | | | | | | | | | All references to it were removed in 739ad9de2a11bb8c67d77641a86cfd39e4594542
| * | | | Remove spurious argumentRodolfo Carvalho2017-01-091-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-bz1390135Scott Dodson2017-01-091-0/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | The scaleup subcommand does not support the unattended option
| * | | | The scaleup subcommand does not support the unattended optionTim Bielawa2017-01-091-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 Dodson2017-01-093-2/+235
| | | |
* | | | Merge pull request #3055 from abutcher/openshift_image_tag=latestScott Dodson2017-01-093-6/+7
|\ \ \ \ | | | | | | | | | | Fix openshift_image_tag=latest.
| * | | | Fix openshift_image_tag=latest.Andrew Butcher2017-01-093-6/+7
| |/ / /
* | | | Merge pull request #3021 from tbielawa/fix_aoi_manTim Bielawa2017-01-093-6/+7
|\ \ \ \ | | | | | | | | | | Update aoi manpage with correct operation count
| * | | | Update manpage version.Tim Bielawa2017-01-092-3/+4
| | | | |
| * | | | Update aoi manpage with correct operation countTim Bielawa2016-12-282-4/+4
| | | | |
* | | | | Merge pull request #2909 from mtnbikenc/firewalldScott Dodson2017-01-095-18/+26
|\ \ \ \ \ | |_|/ / / |/| | | | Enable firewalld by default
| * | | | Enable firewalld by defaultRussell Teague2016-12-145-18/+26
| | | | |
* | | | | Merge pull request #3058 from openshift/etcd-imageScott Dodson2017-01-091-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | etcd 3.x image is 'etcd' not 'etcd3'
| * | | | Use registry.access.redhat.com/rhel7/etcd instead of etcd3Scott Dodson2017-01-091-2/+1
| | | | |
* | | | | Merge pull request #3015 from smarterclayton/future_versions_masterScott Dodson2017-01-084-5/+17
|\ \ \ \ \ | | | | | | | | | | | | Add future versions to openshift_facts
| * | | | | Add future versions to openshift_factsClayton Coleman2017-01-044-5/+17
| | |_|/ / | |/| | |
* | | | | Merge pull request #3054 from sdodson/fix-repo-boolsScott Dodson2017-01-061-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | Fix repo defaults