summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3820 from sdodson/masterScott Dodson2017-03-311-77/+120
|\ | | | | Fix generated code
| * Fix generated codeScott Dodson2017-03-311-77/+120
|/
* Merge pull request #3777 from jcantrill/es_loggingOpenShift Bot2017-03-315-14/+38
|\ | | | | Merged by openshift-bot
| * bug 1432607. Allow configuration of ES log destinationJeff Cantrill2017-03-305-14/+38
| |
* | Automatic commit of package [openshift-ansible] release [3.6.13-1].Jenkins CD Merge Bot2017-03-312-2/+20
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | Merge pull request #3809 from stobias123/metrics-decode-syntaxOpenShift Bot2017-03-301-2/+2
|\ \ | | | | | | Merged by openshift-bot
| * | fixed decode switch so it works on OSXSteven Tobias2017-03-301-2/+2
| | |
* | | Merge pull request #3804 from sdodson/bz1436964OpenShift Bot2017-03-301-0/+10
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Wait for firewalld polkit policy to be definedScott Dodson2017-03-301-0/+10
| | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1436964
* | | | Merge pull request #3786 from kwoodson/oc_clusterroleScott Dodson2017-03-309-0/+2463
|\ \ \ \ | | | | | | | | | | Add oc_clusterrole to lib_openshift.
| * | | | Fixed spacing.Kenny Woodson2017-03-292-6/+6
| | | | |
| * | | | Fixed docs. Fixed add_resource.Kenny Woodson2017-03-293-10/+12
| | | | |
| * | | | Fixing linting for spaces.Kenny Woodson2017-03-293-9/+8
| | | | |
| * | | | Adding clusterrole to the toolbox.Kenny Woodson2017-03-289-0/+2462
| | | | |
* | | | | Merge pull request #3792 from ewolinetz/fix_metrics_image_settingsOpenShift Bot2017-03-301-6/+0
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Removing initial setting of metrics image prefix and versionewolinetz2017-03-281-6/+0
| | | | | |
* | | | | | Merge pull request #3628 from kwoodson/yedit_editsOpenShift Bot2017-03-3034-2213/+3557
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Merged by openshift-bot
| * | | | | Fixed a bug in oc_volume.Kenny Woodson2017-03-2831-764/+852
| | | | | |
| * | | | | Adding a few more test cases. Fixed a bug when key was empty. Safeguard ↵Kenny Woodson2017-03-2828-1468/+2593
| | | | | | | | | | | | | | | | | | | | | | | | against yedit module being passed an empty key
| * | | | | Added the ability to do multiple editsKenny Woodson2017-03-285-111/+242
| | | | | |
* | | | | | Merge pull request #3770 from jcantrill/es_config_merge_fixOpenShift Bot2017-03-302-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | fix es config merge so template does not need quoting. gen then mergeJeff Cantrill2017-03-282-9/+9
| | | | | | |
* | | | | | | Merge pull request #3801 from mtnbikenc/fix-copyOpenShift Bot2017-03-301-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Correct copy task to use remote sourceRussell Teague2017-03-291-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #3734 from sosiouxme/20170322-deployment-typeOpenShift Bot2017-03-3027-42/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | validate and normalize inventory variablesLuke Meyer2017-03-2927-42/+88
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In openshift_repos and everywhere, ensure deployment_type and openshift_deployment_type are defined and the same. We really want to set openshift_deployment_type, but users will likely still have just deployment_type, so accept both. And don't make every playbook default openshift_deployment_type to deployment_type. This introduces the openshift_sanitize_inventory role to run before anything else.
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.12-1].Jenkins CD Merge Bot2017-03-302-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Merge pull request #3581 from php-coder/set_cert_expiration_dateOpenShift Bot2017-03-2919-1/+70
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Merged by openshift-bot
| * | | | | | Update example inventory files to mention certificate validity parameters.Slava Semushin2017-03-292-0/+20
| | | | | | |
| * | | | | | openshift_hosted: add openshift_hosted_registry_cert_expire_days parameter.Slava Semushin2017-03-293-0/+3
| | | | | | |
| * | | | | | oc_adm_ca_server_cert.py: re-generate.Slava Semushin2017-03-291-0/+8
| | | | | | |
| * | | | | | oc_adm_ca_server_cert: add expire_days parameter.Slava Semushin2017-03-293-0/+8
| | | | | | |
| * | | | | | openshift_ca: add openshift_ca_cert_expire_days and ↵Slava Semushin2017-03-293-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_master_cert_expire_days parameters.
| * | | | | | redeploy-certificates/registry.yml: add ↵Slava Semushin2017-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_hosted_registry_cert_expire_days parameter.
| * | | | | | openshift_master_certificates: add openshift_master_cert_expire_days parameter.Slava Semushin2017-03-293-0/+9
| | | | | | |
| * | | | | | openshift_node_certificates: add openshift_node_cert_expire_days parameter.Slava Semushin2017-03-293-0/+9
|/ / / / / /
* | | | | | Merge pull request #3725 from codificat/Dockerfile.rhel7OpenShift Bot2017-03-291-19/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Update Dockerfile.rhel7 to reflect changes to DockerfilePep Turró Mauri2017-03-231-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Dockerfile in the repo was updated to build upon playbook2image. This change updates de product version to reflect that change. Also updating the labels to the new format.
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.11-1].Jenkins CD Merge Bot2017-03-292-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Merge pull request #3782 from sdodson/etcd_debugOpenShift Bot2017-03-283-0/+14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Merged by openshift-bot
| * | | | | | Add etcd_debug and etcd_log_package_levels variablesScott Dodson2017-03-283-0/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3781 from ↵OpenShift Bot2017-03-286-34/+29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | ingvagabund/make-the-ocp-version-detection-excluder-free Merged by openshift-bot
| * | | | | Make the OCP available version detection excluder freeJan Chaloupka2017-03-286-34/+29
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | When detecting available OCP version via repoquery, use yum.conf file with exclude= set to an empty array. So the detection is independent of the OCP excluder.
* | | | | Merge pull request #3769 from abutcher/gte-version-filtersOpenShift Bot2017-03-282-0/+201
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Use oo_version_gte_3_6+ for future versions and treat 1.x origin as legacy. ↵Andrew Butcher2017-03-272-28/+131
| | | | | | | | | | | | | | | | | | | | | | | | Add tests.
| * | | | | Add oo_version_gte_X_X_or_Y_Y version comparison filters.Andrew Butcher2017-03-241-0/+98
| | | | | |
* | | | | | Merge pull request #3750 from stevekuznetsov/skuznets/3-6-upgradeOpenShift Bot2017-03-289-0/+379
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Merged by openshift-bot
| * | | | | Added 3.5 -> 3.6 upgrade playbooksSteve Kuznetsov2017-03-249-0/+379
| | | | | |
* | | | | | Merge pull request #3745 from rhcarvalho/checks-unit-testsOpenShift Bot2017-03-2812-20/+237
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Merged by openshift-bot
| * | | | | Add test scaffold for docker_image_availability.pyRodolfo Carvalho2017-03-282-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention is to set a starting point and let another team member work on the code to gain experience with tests.