csa/devops/ansible-patches/openshift.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3158 from bparees/skip_proxies	Jason DeTiberus	2017-01-24	1	-0/+12
\|\ \| \| \| \|	do not set empty proxy env variable defaults
\| *	do not set empty proxy env variable defaults	Ben Parees	2017-01-24	1	-0/+12
\| \|
* \|	Merge pull request #3145 from jcantrill/bz_1414477_missing_import_jks_deuce	Scott Dodson	2017-01-24	3	-137/+49
\|\ \ \| \| \| \| \| \|	Bz 1414477 missing import jks deuce
\| * \|	fix BZ1414477. Use keytool on control node and require java	Jeff Cantrill	2017-01-23	3	-137/+49
\| \| \|
* \| \|	Merge pull request #3101 from dgoodwin/pre-post-master-hook	Jason DeTiberus	2017-01-24	3	-0/+62
\|\ \ \ \| \| \| \| \| \| \| \|	Implement simple hooks pre/post master upgrade.
\| * \| \|	Add a mid upgrade hook, re-prefix variables.	Devan Goodwin	2017-01-23	3	-17/+33
\| \| \| \|
\| * \| \|	Debug message before running hooks.	Devan Goodwin	2017-01-19	1	-0/+6
\| \| \| \|
\| * \| \|	Run user provided hooks prior to system/service restarts.	Devan Goodwin	2017-01-19	1	-3/+4
\| \| \| \|
\| * \| \|	Implement pre/post master upgrade hooks.	Devan Goodwin	2017-01-19	3	-0/+39
\| \| \| \|
* \| \| \|	Merge pull request #3161 from tbielawa/maccabe_version_conflict	Jason DeTiberus	2017-01-24	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	TEMPORARY work-around for flake8 vs maccabe version conflict
\| * \| \| \|	Temporary work-around for flake8 vs maccabe version conflict	Tim Bielawa	2017-01-24	1	-0/+2
\|/ / / /
* \| \| \|	Merge pull request #3152 from abutcher/iptables-w	Scott Dodson	2017-01-24	1	-1/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Bug 1415800 - Installer fails to add/check iptables rule due to lock on xtables.
\| * \| \|	[os_firewall] Add -w flag to wait for iptables xtables lock.	Andrew Butcher	2017-01-23	1	-1/+3
\| \| \| \|
* \| \| \|	Merge pull request #3155 from abutcher/bz1368579	Scott Dodson	2017-01-23	1	-21/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove unused temporary directory in master config playbook.
\| * \| \| \|	Remove unused temporary directory in master config playbook.	Andrew Butcher	2017-01-23	1	-21/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3135 from ewolinetz/fix_logging_jks_gen	Scott Dodson	2017-01-23	6	-78/+128
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Updating to use local_action script to generate jks certs for logging
\| * \ \ \ \	Merge branch 'master' into fix_logging_jks_gen	Eric Wolinetz	2017-01-23	27	-112/+1884
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3151 from jcantrill/bz_1414625_require_httpd_tools	Scott Dodson	2017-01-23	3	-0/+23
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	fixes BZ-1414625. Check for httpd-tools and java before install
\| * \| \| \| \|	fixes BZ-1414625. Check for httpd-tools and java before install	Jeff Cantrill	2017-01-23	3	-0/+23
\|/ / / / /
* \| \| \| \|	Merge pull request #3106 from andrewklau/haproxy-container	Scott Dodson	2017-01-22	3	-4/+40
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Add containzerized haproxy option
\| * \| \| \|	Add containzerized haproxy option	Andrew Lau	2017-01-21	3	-4/+40
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3136 from jcantrill/logging_oc_apply	Jason DeTiberus	2017-01-20	1	-7/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix openshift_logging oc_apply to allow running on any control node
\| * \| \| \| \|	fix oc_apply to allow running on any control node	Jeff Cantrill	2017-01-19	1	-7/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3128 from jcantrill/3127_oc_apply_for_metrics	Jason DeTiberus	2017-01-20	1	-4/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #3127. Get files for oc_apply from remote host
\| * \| \| \| \| \|	fixes #3127. Get files for oc_apply from remote host	Jeff Cantrill	2017-01-19	1	-4/+12
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #3143 from abutcher/reorder-dnsmasq-config	Jason DeTiberus	2017-01-20	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Apply openshift_node_dnsmasq after os_firewall in node deps
\| * \| \| \| \|	Reorder node dnsmasq dependency s.t. networkmanager is restarted after ↵	Andrew Butcher	2017-01-20	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	firewall changes have been applied.
* \| \| \| \|	Merge pull request #3130 from kwoodson/lib_openshift_version	Kenny Woodson	2017-01-20	15	-63/+1789
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Adding oc_version to lib_openshift.
\| * \| \| \| \|	Adding version to lib_openshift	Kenny Woodson	2017-01-20	15	-63/+1789
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3132 from richm/g_master_mktemp-conflict	Andrew Butcher	2017-01-20	1	-4/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	g_master_mktemp in openshift-master conflicts with openshift_master_certificates
\| * \| \| \| \|	g_master_mktemp in openshift-master conflicts with openshift_master_certificates	Rich Megginson	2017-01-19	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3138 from gabemontero/fixJenkins1-3	Scott Dodson	2017-01-20	2	-28/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	jenkins v1.3 templates should not enable oauth
\| * \| \| \| \|	jenkins v1.3 templates should not enable oauth	gabemontero	2017-01-20	2	-28/+0
\|/ / / / /
\| \| \| * \|	Adding to ansible spec and changing logging jks generation to be a local_action	ewolinetz	2017-01-20	5	-36/+115
\| \| \| \| \|
\| \| \| * \|	Removing docker run strategy and make java a requirement for control host	ewolinetz	2017-01-20	3	-13/+18
\| \| \| \| \|
\| \| \| * \|	Updating to use docker run instead of scheduling jks gen pod	ewolinetz	2017-01-20	1	-47/+13
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #3123 from jcantrill/bz_141619	Jason DeTiberus	2017-01-19	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Corrects the metrics variable in the README
\| * \| \| \|	fixes BZ141619. Corrects the variable in the README	Jeff Cantrill	2017-01-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3126 from mtnbikenc/fix-upgrade-repocache	Jason DeTiberus	2017-01-19	3	-8/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cleaning repo cache earlier when upgrading
\| * \| \| \| \|	Cleaning repo cache earlier	Russell Teague	2017-01-19	3	-8/+17
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #3117 from kwoodson/lib_openshift	Kenny Woodson	2017-01-19	8	-27/+1787
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Adding modules to lib_openshift.
\| * \| \| \|	Adding oc_obj to the lib_openshift library	Kenny Woodson	2017-01-18	8	-27/+1787
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3124 from ashcrow/spec-tar	Scott Dodson	2017-01-19	1	-0/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Added tar as a requirement per BZ1388445
\| * \| \| \|	Added tar as a requirement per BZ1388445	Steve Milner	2017-01-19	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #3120 from ewolinetz/logging_role_fixes	Jason DeTiberus	2017-01-19	2	-3/+3
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Addressing found issues with logging role
\| * \| \|	Addressing found issues with logging role	ewolinetz	2017-01-18	2	-3/+3
\| \|/ /
* \| \|	Merge pull request #3093 from mtnbikenc/upgrade-fix	Scott Dodson	2017-01-19	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Correct consistency between upgrade playbooks
\| * \| \|	Correct consistency between upgrade playbooks	Russell Teague	2017-01-13	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #3057 from dgoodwin/serial-master-upgrade	Scott Dodson	2017-01-19	8	-33/+45
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Serial master upgrade
\| * \| \| \|	Perform master upgrades in a single play serially.	Devan Goodwin	2017-01-18	3	-28/+24
\| \| \| \| \|