summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3085 from abutcher/no-nfs-group-defaultScott Dodson2017-01-161-5/+0
|\ | | | | Do not default registry storage kind to 'nfs' when 'nfs' host group exists.
| * Do not default registry storage kind to 'nfs' when 'nfs' group exists.Andrew Butcher2017-01-121-5/+0
| | | | | | | | | | | | | | This makes it possible to use openshift-ansible configured nfs for hosted components other than the registry while also configuring empty-dir registry storage (no openshift_hosted_registry_storage_kind set).
* | Merge pull request #3091 from ashcrow/modify-yamlAndrew Butcher2017-01-161-8/+19
|\ \ | | | | | | Updated modify_yaml with docstring and clarifications
| * | Updated modify_yaml with docstring and clarificationsSteve Milner2017-01-131-8/+19
| | |
* | | Merge pull request #3090 from jfchevrette/fix_pv_template_specAndrew Butcher2017-01-161-2/+2
|\ \ \ | | | | | | | | Fix role openshift_storage_nfs_lvm keys should be lowercase in the pv spec template
| * | | keys should be lowercase according to the specJean-Francois Chevrette2017-01-121-2/+2
| | | |
* | | | Merge pull request #3088 from jfchevrette/fix_openshift_storage_nfs_lvmAndrew Butcher2017-01-162-2/+3
|\ \ \ \ | |_|/ / |/| | | Fix role openshift_storage_nfs_lvm
| * | | fix when statement indentation, cast to boolJean-Francois Chevrette2017-01-121-1/+1
| | | |
| * | | add openshift_facts as role dependencyJean-Francois Chevrette2017-01-121-1/+2
| |/ /
* | | Merge pull request #3089 from ashcrow/openshift-master-updatesAndrew Butcher2017-01-131-11/+8
|\ \ \ | |/ / |/| | openshift_master filter updates
| * | filter: Removed unused validation callsSteve Milner2017-01-121-3/+0
| | | | | | | | | | | | | | | | | | The parent class for filters in openshift_master defines a validate method which does nothing. This change removes calls to this method while leaving the validation implementations as is.
| * | Updated initializer usage in filtersSteve Milner2017-01-121-11/+11
|/ / | | | | | | | | | | Switched from explicit parent class usage to super(). See: https://docs.python.org/2/library/functions.html#super
* | Merge pull request #3087 from ashcrow/setuppyScott Dodson2017-01-122-2/+4
|\ \ | | | | | | Added setup.py to flake8 tests
| * | Added setup.py to flake8 testsSteve Milner2017-01-122-2/+4
|/ / | | | | | | | | | | | | | | Added setup.py to flake8 tests since it is code. Also minor updates to slightly modernize. Note: In the future {#} should probably be ported to {} as numbering is no longer needed (and disliked by many).
* | Merge pull request #3084 from tbielawa/issue_template_updateScott Dodson2017-01-121-12/+42
|\ \ | |/ |/| Another proposed update to the issue template
| * Another proposed update to the issue templateTim Bielawa2017-01-121-12/+42
|/
* Merge pull request #3081 from lberk/masterScott Dodson2017-01-121-1/+1
|\ | | | | Fix typo in inventory README.md
| * Fix typo in inventory README.mdLukas Berk2017-01-121-1/+1
|/ | | | libviert -> libvirt
* Merge pull request #3076 from ashcrow/flatten-oo-filtersJason DeTiberus2017-01-111-896/+898
|\ | | | | WIP: oo_filters: Moved static methods to functions
| * oo_filters: Moved static methods to functionsSteve Milner2017-01-111-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_docsJason DeTiberus2017-01-111-22/+40
|\ \ | | | | | | first swing at release version wording
| * | first swing at release version wordingTim Bielawa2017-01-111-22/+40
|/ / | | | | | | clarify our branching and release compat. policy.
* | Merge pull request #3030 from kwoodson/yaml_editorScott Dodson2017-01-1111-0/+2118
|\ \ | | | | | | Ansible module for modifying yaml idempotently.
| * | Adding ability to systematically modify yaml from ansible.Kenny Woodson2017-01-1111-0/+2118
| |/
* | 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