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 #929 from sdodson/fix-30-imagestreams	Brenton Leanhardt	2015-11-20	114	-6/+22520
\|\ \| \| \| \|	Install version dependent image streams for v1.0 and v1.1
\| *	Install version dependent image streams for v1.0 and v1.1	Scott Dodson	2015-11-18	114	-6/+22520
\| \|
* \|	Merge pull request #938 from brenton/uninstall	Brenton Leanhardt	2015-11-20	1	-5/+5
\|\ \ \| \| \| \| \| \|	Making the uninstall playbook more flexible
\| * \|	Making the uninstall playbook more flexible	Brenton Leanhardt	2015-11-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This handles stage environments as well as the eventual change of aep3_beta to aep3
* \| \|	Merge pull request #924 from detiber/noSetHostname	Brenton Leanhardt	2015-11-20	1	-3/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Do not update the hostname
\| * \| \|	Do not update the hostname	Jason DeTiberus	2015-11-17	1	-3/+0
\| \| \| \|
* \| \| \|	Merge pull request #945 from abutcher/OoCollect	Brenton Leanhardt	2015-11-20	3	-7/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Replace map with oo_collect for python-jinja2 <2.7
\| * \| \| \|	Replace map with oo_collect to support python-jinja2 <2.7	Andrew Butcher	2015-11-20	3	-7/+7
\| \| \| \| \|
* \| \| \| \|	Merge pull request #902 from dgoodwin/rpm-test-fix	Brenton Leanhardt	2015-11-20	3	-8/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Default to OSE 3.1 in interactive installer instead of 3.0.
\| * \| \| \| \|	Pylint fix for long line in cli docstring.	Devan Goodwin	2015-11-16	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Default to installing OSE 3.1 instead of 3.0.	Devan Goodwin	2015-11-16	2	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix tests on systems with openshift-ansible rpms installed.	Devan Goodwin	2015-11-16	2	-4/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.0.14-1].	Brenton Leanhardt	2015-11-19	2	-2/+67
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #939 from mwoodson/master_checks	Matt Woodson	2015-11-19	1	-0/+82
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added metric quantile items to zabbix
\| * \| \| \| \| \|	added metric items to zabbix for openshift online	Matt Woodson	2015-11-19	1	-0/+82
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #940 from kwoodson/usergrpfix	Kenny Woodson	2015-11-19	1	-22/+42
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Added the ability to add users to usergroups through the zbx_usergroups module.
\| * \| \| \| \|	Updating usergroups to accept users	Kenny Woodson	2015-11-19	1	-22/+42
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #937 from rdossin1A/machine_types	Thomas Wiest	2015-11-19	4	-2/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Differentiate machine types on GCE (master and nodes)
\| * \| \| \| \| \|	Differentiate machine types on GCE (master and nodes)	Romain Dossin	2015-11-19	4	-2/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #933 from menren/dockerOnMasterAWS	Thomas Wiest	2015-11-19	3	-7/+14
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	Docker on master aws
\| * \| \| \| \| \|	Merge pull request #1 from detiber/dockerOnMasterAWS	Chengcheng Mu	2015-11-19	3	-6/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	small tweaks for adding docker volume for aws master hosts
\| \| * \| \| \| \| \|	small tweaks for adding docker volume for aws master hosts	Jason DeTiberus	2015-11-18	3	-6/+5
\| \|/ / / / / /
\| * \| \| \| \| /	add a volume on master host, in AWS provisioning	Chengcheng Mu	2015-11-18	3	-3/+11
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #881 from abutcher/namedCertRefactor	Brenton Leanhardt	2015-11-19	5	-35/+108
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Refactor named certficates
\| * \| \| \| \|	Update certificate paths when 'names' key is provided.	Andrew Butcher	2015-11-18	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add additive_facts_to_overwrite instead of overwriting all additive_facts	Andrew Butcher	2015-11-16	2	-18/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Refactor named certificates.	Andrew Butcher	2015-11-16	5	-35/+94
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #936 from detiber/uninstallUpdate	Brenton Leanhardt	2015-11-18	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Uninstall - Remove systemd wants file for node
\| * \| \| \| \|	Uninstall - Remove systemd wants file for node	Jason DeTiberus	2015-11-18	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #918 from detiber/fix_ec2_instance_type_override	Thomas Wiest	2015-11-18	2	-9/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ec2 instance type override
\| * \| \| \| \| \|	Fix ec2 instance type override	Jason DeTiberus	2015-11-17	2	-9/+16
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #934 from detiber/requiretty	Thomas Wiest	2015-11-18	1	-0/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ec2 - force !requiretty for ssh_user
\| * \| \| \| \| \|	ec2 - force !requiretty for ssh_user	Jason DeTiberus	2015-11-18	1	-0/+7
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #928 from joelddiaz/monitoring-deploy	Joel Diaz	2015-11-18	9	-0/+243
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Created role to deploy ops host monitoring
\| * \| \| \| \|	Created role to deploy ops host monitoring	Joel Diaz	2015-11-18	9	-0/+243
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	oso_host_monitoring to config/run host monitoring container(s)
* \| \| \| \| \|	Merge pull request #927 from abutcher/formatFields	Thomas Wiest	2015-11-18	1	-10/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use field numbers for each format in bin/cluster for python 2.6
\| * \| \| \| \| \|	Use field numbers for all formats in bin/cluster for python 2.6	Andrew Butcher	2015-11-17	1	-10/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #862 from twiest/update_ec2py	Thomas Wiest	2015-11-18	2	-62/+680
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updating to the latest ec2.py (and re-patching with our changes).
\| * \| \| \| \| \| \|	updating to the latest ec2.py (and re-patching with our changes).	Thomas Wiest	2015-11-16	2	-62/+680
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #931 from kwoodson/httptest	Kenny Woodson	2015-11-18	1	-0/+282
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	Adding httptest to zabbix library
\| * \| \| \| \| \| \|	First attempt at adding web scenarios	Kenny Woodson	2015-11-17	1	-0/+282
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #926 from brenton/aep3	Brenton Leanhardt	2015-11-17	3	-3/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The aep3 images changed locations.
\| * \| \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.0.13-1].	Brenton Leanhardt	2015-11-17	2	-2/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	The aep3 images changed locations.	Brenton Leanhardt	2015-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	atomic-openshift-installer: Correct single master case	Samuel Munilla	2015-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct the case where the first host entered is not a master.
\| * \| \| \| \| \| \| \|	atomic-openshift-installer: Temporarily restrict to single master	Samuel Munilla	2015-11-17	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For now, we should restrict the quick installer to a single master. This should change in the near future.
* \| \| \| \| \| \| \| \|	Merge pull request #903 from detiber/gluster_fix	Brenton Leanhardt	2015-11-17	1	-2/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|	Bug 1282336 - Add additional seboolean for gluster
\| * \| \| \| \| \| \| \|	Bug 1282336 - Add additional seboolean for gluster	Jason DeTiberus	2015-11-16	1	-2/+7
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added setting seboolean for virt_sandbox_use_fusefs - Added a failed_when to not fail if virt_sandbox_use_fusefs does not exist
* \| \| \| \| \| \| \|	Merge pull request #925 from smunilla/single_master	Brenton Leanhardt	2015-11-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	atomic-openshift-installer: Correct single master case
\| * \| \| \| \| \| \| \|	atomic-openshift-installer: Correct single master case	Samuel Munilla	2015-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct the case where the first host entered is not a master.