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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add NO_PROXY workaround for container-engine atomic command	Steve Milner	2017-05-15	1	-0/+4
\| \| \| \|	Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1450310
*	Add no_proxy to atomic.conf	Steve Milner	2017-05-15	1	-1/+9
\| \| \| \|	Requires: https://github.com/projectatomic/atomic/pull/999
*	Merge pull request #4184 from ashcrow/rslave	OpenShift Bot	2017-05-14	2	-12/+16
\|\ \| \| \| \|	Merged by openshift-bot
\| *	Add docker package for container-engine install	Steve Milner	2017-05-14	2	-12/+16
\|/ \| \| \| \|	The package is required so that openshift_facts is able to use the docker client to gain information on the versions.
*	Automatic commit of package [openshift-ansible] release [3.6.68-1].	Jenkins CD Merge Bot	2017-05-13	2	-2/+50
\| \| \| \| \| \|	Created by command: /usr/bin/tito tag --accept-auto-changelog
*	Merge pull request #4113 from ↵	OpenShift Bot	2017-05-13	3	-14/+6
\|\ \| \| \| \| \| \| \| \|	jcantrill/bz1448860_make_recovery_after_nodes_to_node_quorum Merged by openshift-bot
\| *	bug 1448860. Change recovery_after_nodes to match node_quorum	Jeff Cantrill	2017-05-11	3	-14/+6
\| \|
* \|	Merge pull request #4155 from ewolinetz/registry_console_upgrade	OpenShift Bot	2017-05-13	1	-0/+22
\|\ \ \| \| \| \| \| \|	Merged by openshift-bot
\| * \|	Updating registry-console image version during a post_control_plane upgrade	ewolinetz	2017-05-12	1	-0/+22
\| \| \|
* \| \|	Merge pull request #4174 from ashcrow/remove-userland-proxy	OpenShift Bot	2017-05-12	1	-2/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \|	Remove userland-proxy-path from daemon.json	Steve Milner	2017-05-12	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This flag is currently being set within the system container via the init.sh
* \| \| \|	Merge pull request #4172 from ashcrow/1450307	OpenShift Bot	2017-05-12	3	-12/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \|	Fix whistespace issues in custom template	Steve Milner	2017-05-12	1	-6/+6
\| \| \| \| \|
\| * \| \| \|	Always add proxy items to atomic.conf	Steve Milner	2017-05-12	1	-4/+1
\| \| \| \| \|
\| * \| \| \|	Move container-engine systemd environment to updated location	Steve Milner	2017-05-12	2	-2/+3
\| \|/ / /
* \| \| \|	Merge pull request #4030 from liggitt/reserved-namespaces	OpenShift Bot	2017-05-12	2	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \|	Reserve kubernetes and 'kubernetes-' prefixed namespaces	Jordan Liggitt	2017-04-27	2	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4162 from jcantrill/bz1439451_kibana_crash	OpenShift Bot	2017-05-12	2	-10/+33
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Merged by openshift-bot
\| * \| \| \|	bug 1441369. Kibana memory limits	Jeff Cantrill	2017-05-11	2	-10/+33
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bug 1439451. Kibana crash (cherry picked from commit 66315ebbfcfda72d6f501c441359d92ec71af7d2)
* \| \| \|	Merge pull request #4126 from VincentS/SDN_Check_Fix	Jan Chaloupka	2017-05-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix for OpenShift SDN Check
\| * \| \| \|	Fix for OpenShift SDN Check	Vincent Schwarzer	2017-05-09	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4065 from ingvagabund/introduce-get-rpm-version-role	Jan Chaloupka	2017-05-12	13	-67/+106
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Introduce excluder-free rpm version detection role
\| * \| \| \| \|	Extend repoquery command (of lib_utils role) to ignore excluders	Jan Chaloupka	2017-05-11	13	-67/+106
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3879 from ingvagabund/run-excluders-on-selected-hosts-only	Jan Chaloupka	2017-05-12	21	-54/+100
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	run excluders over selected set of hosts during control_plane/node upgrade
\| * \| \| \| \| \|	run excluders over selected set of hosts during control_plane/node upgrade	Jan Chaloupka	2017-05-03	21	-54/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable/reset excluders over requested hosts
* \| \| \| \| \| \|	Merge pull request #4164 from ashcrow/simplify-daemon-json	OpenShift Bot	2017-05-11	2	-45/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \|	doc: Add link to daemon.json upstream doc	Steve Milner	2017-05-11	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unused daemon.json keys	Steve Milner	2017-05-11	1	-45/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of providing every possible key in the daemon.json configuration file, this update only provides keys which are actively set/used by the installer.
* \| \| \| \| \| \| \|	Merge pull request #4115 from ewolinetz/metrics_limits_docs	OpenShift Bot	2017-05-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	Updating size suffix for metrics in role	ewolinetz	2017-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4153 from ewolinetz/bz1449554	OpenShift Bot	2017-05-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	Updating 3.6 enterprise registry-console template image version	ewolinetz	2017-05-10	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4158 from ganhuang/lower_bool	Scott Dodson	2017-05-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	lower case in /etc/daemon.json and correct block-registry
\| * \| \| \| \| \| \|	lower case in /etc/daemon.json and correct block-registry	Gan Huang	2017-05-11	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4156 from mwoodson/fix_yedit_seps	OpenShift Bot	2017-05-11	29	-29/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	Fix for yedit custom separators	Matt Woodson	2017-05-10	29	-29/+29
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4152 from sdodson/iptables-default	OpenShift Bot	2017-05-10	4	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	Default to iptables on master	Scott Dodson	2017-05-10	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We did this in 3.5 but never on master and we never came back to add migration support. So we'll revert this on master and if/when we add migration support we'll switch the default.
* \| \| \| \| \| \| \| \|	Merge pull request #4118 from mtnbikenc/fix-groups	OpenShift Bot	2017-05-10	3	-4/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	Temporarily revert to OSEv3 host group usage	Russell Teague	2017-05-09	3	-4/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4131 from ashcrow/1448800	Scott Dodson	2017-05-10	20	-48/+152
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update systemd units to use proper container service name
\| * \| \| \| \| \| \| \| \|	Add service file templates for master and node	Steve Milner	2017-05-09	6	-1/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds service file templates for both maste and node. These will lay down in /etc/system/systemd to override what may already be present from a package. These instances take into account the name of the container daemon (docker or container-engine).
\| * \| \| \| \| \| \| \| \|	Update systemd units to use proper container service name	Steve Milner	2017-05-09	14	-47/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- If using a system container: container-engine - If using a package install: docker Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1448800
* \| \| \| \| \| \| \| \| \|	Merge pull request #4147 from ashcrow/lowercase-true	Scott Dodson	2017-05-10	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure true is lowercase in daemon.json
\| * \| \| \| \| \| \| \| \| \|	Rename blocked-registries to block-registries	Steve Milner	2017-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The daemon.json configuration key is block-registries. The code and installer bits call it blocked-registries.
\| * \| \| \| \| \| \| \| \| \|	Ensure true is lowercase in daemon.json	Steve Milner	2017-05-10	2	-1/+2
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3967 from jarrpa/oc_volume-doc	OpenShift Bot	2017-05-10	2	-0/+24
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \| \| \|	oc_volume: Add missing parameter documentation	Jose A. Rivera	2017-04-21	2	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4136 from richm/find-log-driver	Scott Dodson	2017-05-10	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \|	use docker_log_driver and /etc/docker/daemon.json to determine log driver
\| * \| \| \| \| \| \| \| \| \|	use docker_log_driver and /etc/docker/daemon.json to determine log driver	Rich Megginson	2017-05-09	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We check the following variables, if they are defined, in the order listed below, to see if the journald log driver is set: * openshift_hosted_logging_use_journal * docker_log_driver * openshift.docker.log_driver * openshift.docker.options (look for '--log-driver=journald') If none of these are set, we leave openshift_logging_fluentd_use_journal undefined, and mount both /etc/sysconfig/docker and /etc/docker (for daemon.json) so that fluentd can determine which log driver is being used.