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 #1726 from detiber/htpasswd_users	Jason DeTiberus	2016-04-26	3	-3/+39
\|\ \| \| \| \|	Add support for setting identity provider custom values
\| *	Add support for setting identity provider custom values	Jason DeTiberus	2016-04-25	3	-3/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- htpasswd users - ldap ca file - openid ca file - request_header ca file
* \|	Merge pull request #1777 from brenton/evac	Jason DeTiberus	2016-04-25	1	-1/+1
\|\ \ \| \| \| \| \| \|	Pod evacuation
\| * \|	Merge branch 'master' into evac	Brenton Leanhardt	2016-04-25	15	-20/+215
\| \|\\|
\| * \|	Pod must be recreated for the upgrade	Brenton Leanhardt	2016-04-25	1	-1/+1
\| \| \|
* \| \|	Merge pull request #1793 from detiber/default_subdomain	Jason DeTiberus	2016-04-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Fix backward compat for osm_default_subdomain
\| * \| \|	Fix backward compat for osm_default_subdomain	Jason DeTiberus	2016-04-25	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #1803 from sdodson/issue1800	Jason DeTiberus	2016-04-25	1	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Fix image version handling for v1.2.0-rc1
\| * \| \|	Merge branch 'master' into issue1800	Scott Dodson	2016-04-25	20	-88/+282
\| \|\\| \|
\| * \| \|	Fix image version handling for v1.2.0-rc1	Scott Dodson	2016-04-25	1	-2/+3
\| \| \| \|
* \| \| \|	Merge pull request #1804 from abutcher/v2-sudo	Jason DeTiberus	2016-04-25	10	-31/+31
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Replace deprecated sudo with become.
\| * \| \|	Replace deprecated sudo with become.	Andrew Butcher	2016-04-25	10	-31/+31
\| \| \| \|
* \| \| \|	Merge pull request #1802 from detiber/etcd_fact_deps	Jason DeTiberus	2016-04-25	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	openshift_etcd_facts should rely on openshift_facts not openshift_common
\| * \| \|	openshift_etcd_facts should rely on openshift_facts not openshift_common	Jason DeTiberus	2016-04-25	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #1385 from sdodson/global-proxy	Jason DeTiberus	2016-04-25	12	-16/+205
\|\ \ \ \| \| \| \| \| \| \| \|	Global Proxy Config
\| * \| \|	Sort and de-dupe no_proxy list	Scott Dodson	2016-04-25	1	-0/+18
\| \| \| \|
\| * \| \|	Add global proxy configuration	Scott Dodson	2016-04-22	12	-16/+187
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Configures HTTP_PROXY, HTTPS_PROXY, NO_PROXY for master and docker services. Configugres BuildDefaults Admission controller for master to automatically insert proxy environment configuration into build environments. To use set at least these variables - openshift_http_proxy - openshift_https_proxy NO_PROXY entries will automatically be configured for hostnames of all openshift hosts. You may specify additional NO_PROXY hosts or patterns by setting `openshift_no_proxy` If you wish to disable automatic generation of NO_PROXY hosts you may set `openshift_generate_no_proxy_hosts` to False. If you wish to have different builddefaults proxy configuration than baseline proxy configuration set these variables - openshift_builddefaults_http_proxy - openshift_builddefaults_https_proxy - openshift_builddefaults_no_proxy - openshift_builddefaults_git_http_proxy - openshift_builddefaults_git_https_proxy
* \| \|	Merge pull request #1786 from enoodle/additional_features_metrics	Jason DeTiberus	2016-04-25	3	-3/+9
\|\ \ \ \| \|_\|/ \|/\| \|	openshift-metrics: adding duration and resolution options
\| * \|	openshift-metrics: adding duration and resolution options	Erez Freiberger	2016-04-24	3	-3/+9
\| \|/
* \|	Merge pull request #1798 from ibotty/remove_duplicate_register	Jason DeTiberus	2016-04-25	1	-1/+0
\|\ \ \| \| \| \| \| \|	remove duplicate `register:`
\| * \|	remove duplicate register:	Tobias Florek	2016-04-06	1	-1/+0
\| \| \|
* \| \|	Changed service account creation to ansible	Vishal Patil	2016-04-24	4	-67/+67
\| \|/ \|/\|
* \|	Fix for docker not present	Jason DeTiberus	2016-04-22	1	-1/+1
\| \|
* \|	Merge pull request #1756 from abhat/configurable_admin_user_pass	Brenton Leanhardt	2016-04-20	3	-1/+10
\|\ \ \| \| \| \| \| \|	Configurable admin username and passsword for Openshift enterprise in Nuage.
\| * \|	Support configurable admin user and password for the enterprise	Aniket Bhat	2016-04-18	3	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Prefix changes for admin and password with nuage_master
* \| \|	Merge pull request #1776 from sdodson/image-stream-sync	Brenton Leanhardt	2016-04-20	10	-170/+339
\|\ \ \ \| \| \| \| \| \| \| \|	Image stream sync
\| * \| \|	Sync latest content	Scott Dodson	2016-04-19	9	-168/+337
\| \| \| \|
\| * \| \|	Use xpaas 1.3.0-1, use enterprise content for metrics	Scott Dodson	2016-04-19	1	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #1758 from dgoodwin/fix-json-vars	Brenton Leanhardt	2016-04-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix use of JSON inventory vars with raw booleans.
\| * \| \| \|	Fix use of JSON inventory vars with raw booleans.	Devan Goodwin	2016-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thought this was fixed in recent patch but somehow backed out a critical change to the isinstance, we need to check for basestring to also have this work with unicode strings.
* \| \| \| \|	Merge pull request #1754 from abutcher/etcd-cert-fixes	Brenton Leanhardt	2016-04-20	14	-72/+83
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bug 1299065: Fix etcd hostname/ip address handling
\| * \| \| \| \|	Remove etcd_interface variable. Remove openshift_docker dependency from the ↵	Andrew Butcher	2016-04-20	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	etcd role.
\| * \| \| \| \|	Use openshift_hostname/openshift_ip values for etcd configuration and ↵	Andrew Butcher	2016-04-20	13	-70/+83
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	certificates.
* \| \| \| \|	Use a JSON list for docker log options.	Devan Goodwin	2016-04-20	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we expected you to comma separate, but this wasn't really clear. Insted we will use an explicit JSON list going forward. The comma separated list will be supported for backwards compatability.
* \| \| \| \|	Merge pull request #1766 from abutcher/router-selector	Brenton Leanhardt	2016-04-20	3	-9/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bug 1328119 - router selector not obeyed
\| * \| \| \| \|	Translate legacy facts within the oo_openshift_env filter.	Andrew Butcher	2016-04-20	1	-6/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Remove empty facts from nested dictionaries.	Andrew Butcher	2016-04-20	1	-8/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Fix router selector fact migration and match multiple selectors when ↵	Andrew Butcher	2016-04-20	4	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	counting nodes.
* \| \| \| \| \|	Merge pull request #1582 from jdnieto/openshift_metrics	Brenton Leanhardt	2016-04-20	6	-0/+152
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	added new openshift-metrics service
\| * \| \| \| \|	added new openshift-metrics service	Jose David Martin Nieto	2016-04-20	6	-0/+152
\| \|/ / / /
* \| \| \| \|	Add openshift_node_dnsmasq	Scott Dodson	2016-04-19	15	-18/+173
\| \| \| \| \|
* \| \| \| \|	Promote portal_net to openshift.common, add kube_svc_ip	Scott Dodson	2016-04-19	6	-8/+28
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: roles/openshift_facts/library/openshift_facts.py
* \| \| \|	Merge pull request #1734 from joelddiaz/tools-roles-move	Joel Diaz	2016-04-19	134	-13659/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	cleanup roles after roles move to openshift-tools
\| * \| \| \|	cleanup roles after roles move to openshift-tools	Joel Diaz	2016-04-15	134	-13659/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also removing inventory/multi_inventory* things left behind unchanged even though they were copied: playbooks/adhoc/* roles/dns roles/kube_nfs_volumes roles/os_update_latest
* \| \| \| \|	Merge pull request #1763 from sdodson/image-stream-sync	Brenton Leanhardt	2016-04-18	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Use 'openshift3/' as IMAGE_PREFIX for enterprise logging and metrics
\| * \| \| \|	IMAGE_PREFIX=openshift3/ for enterprise logging/metrics	Scott Dodson	2016-04-18	1	-1/+1
\| \| \|/ / \| \|/\| \|
* / \| \|	Bug 1320829 - Handle OSE 3.0 installs	Brenton Leanhardt	2016-04-18	1	-1/+1
\|/ / /
* \| \|	Merge pull request #1746 from brenton/docker1	Brenton Leanhardt	2016-04-15	9	-36/+45
\|\ \ \ \| \| \| \| \| \| \| \|	The openshift_docker role must set the version facts for containerize…
\| * \| \|	Support mixed RPM/container installs	Brenton Leanhardt	2016-04-14	2	-6/+6
\| \| \| \|
\| * \| \|	The openshift_docker role must set the version facts for containerized installs	Brenton Leanhardt	2016-04-14	8	-34/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QE found that for fresh installs we were basing the docker version facts of the images that could be pulled prior to configuring /etc/sysconfig/docker. This is an edge case but something we need to fix.