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 #4370 from ashcrow/rename-daemon-json	OpenShift Bot	2017-06-07	2	-5/+7
\|\ \| \| \| \|	Merged by openshift-bot
\| *	rename daemon.json to container-daemon.json	Steve Milner	2017-06-05	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \|	The container-engine build has moved daemon.json to container-daemon.json to avoid collision. This change updates the template file location to follow suit.
* \|	Merge pull request #4371 from ashcrow/1455843-again	OpenShift Bot	2017-06-07	3	-0/+17
\|\ \ \| \| \| \| \| \|	Merged by openshift-bot
\| * \|	Add node unit file on upgrade	Steve Milner	2017-06-06	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When rpm_upgrade is used for upgrading the node's unit file will be overridden. systemd is then reloaded if the files are templated successfully. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1455843
* \| \|	Merge pull request #4374 from jcantrill/specify_empty_index_mapping	Scott Dodson	2017-06-07	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \|	specify all logging index mappings for kibana
\| * \| \|	specify all logging index mappings for kibana	Jeff Cantrill	2017-06-06	1	-0/+1
\| \|/ /
* \| \|	Merge pull request #4349 from sdodson/bz1392519	Scott Dodson	2017-06-07	1	-5/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Do not attempt to override openstack nodename
\| * \| \|	Do not attempt to override openstack nodename	Jason DeTiberus	2017-06-01	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1392519
* \| \| \|	Merge pull request #4331 from stevekuznetsov/skuznets/update-is	Scott Dodson	2017-06-07	2	-8/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Update image stream to openshift/origin:2c55ade
\| * \| \| \|	Update image stream to openshift/origin:2c55ade	Steve Kuznetsov	2017-05-31	2	-8/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* \| \| \| \|	Merge pull request #4278 from abutcher/loopback-kubeconfig	OpenShift Bot	2017-06-07	3	-3/+38
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Merged by openshift-bot
\| * \| \| \|	Use local openshift.master.loopback_url when generating initial master ↵	Andrew Butcher	2017-06-02	3	-3/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loopback kubeconfigs.
* \| \| \| \|	Merge pull request #4327 from ewolinetz/fix_logging_secret	OpenShift Bot	2017-06-06	3	-6/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \|	Updating Kibana-proxy secret key name, fixing deleting secrets, fixed extra ↵	ewolinetz	2017-05-31	3	-6/+8
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	ES dc creation
* \| \| \| \|	Merge pull request #3643 from juanvallejo/jvallejo/elastic-search-check	OpenShift Bot	2017-06-06	13	-6/+1575
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \|	add elasticseatch, fluentd, kibana check	juanvallejo	2017-06-02	13	-6/+1575
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4348 from tbielawa/bz1451693	OpenShift Bot	2017-06-05	2	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \|	Add daemon_reload parameter to service tasks	Tim Bielawa	2017-06-01	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes "Could not find the requested service atomic-openshift-master: cannot enable" error during reinstall. https://bugzilla.redhat.com/show_bug.cgi?id=1451693
* \| \| \| \| \| \|	Merge pull request #4342 from richm/mux-uses-fluentd-secret	OpenShift Bot	2017-06-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \|	mux uses fluentd cert/key to talk to ES	Rich Megginson	2017-05-31	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4267 from ozdanborne/byo-etcd	OpenShift Bot	2017-06-05	7	-23/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \|	Support byo etcd for calico	Dan Osborne	2017-05-24	7	-23/+52
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4064 from juanvallejo/jvallejo/add-ovs-version-check	OpenShift Bot	2017-06-05	4	-92/+334
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	Remove unnecessary comment.	Rodolfo Carvalho	2017-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Capturing the ImportError is a common idiom in Ansible modules, and it is not specific to tox.
\| * \| \| \| \| \| \| \|	update aos_version module to support generic pkgs and versions	juanvallejo	2017-05-24	4	-91/+333
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4157 from ↵	OpenShift Bot	2017-06-05	4	-0/+376
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	juanvallejo/jvallejo/add-retroactive-ovs-version-check Merged by openshift-bot
\| * \| \| \| \| \| \|	add existing_ovs_version check	juanvallejo	2017-05-19	5	-0/+377
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4336 from sdodson/BZ1457062	OpenShift Bot	2017-06-05	2	-0/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \|	Add mtu setting to /etc/sysconfig/docker-network	Scott Dodson	2017-06-01	2	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1457062
* \| \| \| \| \| \| \|	Merge pull request #4309 from ingvagabund/disable-docker-excluder-when-updating	OpenShift Bot	2017-06-02	1	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \|	disable docker excluder before it is updated to remove older excluded packages	Jan Chaloupka	2017-05-30	1	-2/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4232 from richm/mux-namespaces-docs	OpenShift Bot	2017-06-02	5	-15/+60
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \| \|	add mux docs; allow to specify mux namespaces	Rich Megginson	2017-05-31	5	-15/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the necessary documentation for the mux parameters and behavior. This also adds new parameters which allow to specify the namespaces mux must create by default, and which can be optionally added. This casts openshift_logging_use_mux to bool wherever it is used as a boolean. Also - use oc_service `labels` and `external_ips` which are now available.
* \| \| \| \| \| \| \| \| \|	Merge pull request #4322 from ashcrow/1455843	OpenShift Bot	2017-06-01	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \| \| \|	upgrade: Reload systemd before restart	Steve Milner	2017-05-31	1	-0/+8
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The installer now lays down updated systemd unit files in /etc/systemd/system/ which override the units that come with the rpms. Because of this we need to reload systemd before restarting services. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1455843
* \| \| \| \| \| \| \| \| \|	Merge pull request #4333 from jarrpa/oc_secret-type	OpenShift Bot	2017-06-01	8	-5/+46
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \| \|	oc_secret: allow for specifying secret type	Jose A. Rivera	2017-05-31	8	-5/+46
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* \| \| \| \| \| \| \| \|	Merge pull request #4015 from rparulek/copy-nuage-vsd-certs	OpenShift Bot	2017-06-01	6	-10/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \| \| \| \|	Copy Nuage VSD generated user certificates to Openshift master nodes	Sneha Deshpande	2017-05-22	6	-10/+32
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix curator host, port params; remove curator es volumes	Rich Megginson	2017-05-31	2	-5/+4
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4332 from stevekuznetsov/skuznets/escalation-fixes	Scott Dodson	2017-05-31	2	-2/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Revert "Merge pull request #4271 from DG-i/master"
\| * \| \| \| \| \| \| \|	Revert "Merge pull request #4271 from DG-i/master"	Steve Kuznetsov	2017-05-31	2	-2/+0
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6b9e05d16a935d632b83eda601538bff2353e4fb, reversing changes made to 240b923c95e04e9467c607c502c857dd86d14179. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* / \| \| \| \| \| \|	AMP 2.0	Scott Dodson	2017-05-31	12	-160/+1639
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #3941 from pgier/JMAN4-161	Scott Dodson	2017-05-31	4	-0/+624
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	[JMAN4-161] Add template for cloudforms jboss middleware manager
\| * \| \| \| \| \|	[JMAN4-161] Add templates and pv example for cloudforms jboss middleware manager	Paul Gier	2017-04-26	4	-0/+624
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4091 from richm/oc_service-labels-externalIPs	Scott Dodson	2017-05-31	40	-248/+931
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add support for oc_service for labels, externalIPs
\| * \| \| \| \| \| \|	add support for oc_service for labels, externalIPs	Rich Megginson	2017-05-30	40	-248/+931
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for `labels` and `externalIPs` in Services This also adds support for the `labels` parameter of `oadm registry` and `oadm router` to be a `dict` of values. This also converts `labels` dict values in the router and registry classes into a comma delimited list of `key=value` pairs. The list of `--labels` is sorted for consistency in key pair positioning in the output (and for consistency in testing) - otherwise, the order of the list is not guarantee and has actually been observed to be different from run to run.
* \| \| \| \| \| \| \|	Merge pull request #4225 from ingvagabund/relax-rpm-image-version-check	Jan Chaloupka	2017-05-31	1	-2/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	relax check for rpm version and docker image version equality
\| * \| \| \| \| \| \| \|	check for rpm version and docker image version equality only if ↵	Jan Chaloupka	2017-05-18	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	openshift_pkg_version and openshift_image_tag are not defined
* \| \| \| \| \| \| \| \|	Merge pull request #4272 from ashcrow/system-package-no-hardcode	OpenShift Bot	2017-05-30	3	-8/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot