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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Multimaster openshift+contiv fixes	Lance Dillon	2017-11-29	4	-3/+29
\| \| \| \| \| \| \|	Only run default contiv commands once Fix detection of firewalld Open up netmaster ports to all nodes Make sure etcd ca stuff only runs once
*	Merge pull request #6307 from mgugino-upstream-stage/no-log-fix	OpenShift Merge Robot	2017-11-29	2	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Fix no_log warnings for custom module We need to set no_log for password and private_key variables.
\| *	Fix no_log warnings for custom module	Michael Gugino	2017-11-28	2	-6/+6
\| \| \| \| \| \| \| \| \| \|	We need to set no_log for password and private_key variables.
* \|	Merge pull request #5723 from mjudeikis/gluster-registry-backend	Scott Dodson	2017-11-29	14	-48/+128
\|\ \ \| \| \| \| \| \|	Add external glusterfs backend to hosted and glusterfs playbook
\| * \|	Add support for external glusterfs as registry backend	Mangirdas	2017-11-21	14	-48/+128
\| \| \|
* \| \|	Merge pull request #6301 from mgugino-upstream-stage/project_cfg_facts	OpenShift Merge Robot	2017-11-28	4	-41/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic merge from submit-queue. Remove openshift_facts project_cfg_facts
\| * \| \|	Remove openshift_facts project_cfg_facts	Michael Gugino	2017-11-28	4	-41/+12
\| \| \|/ \| \|/\| \| \| \| \| \| \|	This simplifies some variable logic.
* \| \|	Merge pull request #6073 from mjudeikis/fix_glusterfs_restart	Scott Dodson	2017-11-28	1	-0/+10
\|\ \ \ \| \|/ / \|/\| \|	fix for Gluster force restart
\| * \|	Add check for gluterFS DS to stop restarts	Mangirdas	2017-11-19	1	-0/+10
\| \|/
* \|	Merge pull request #6299 from mgugino-upstream-stage/dns-facts	Michael Gugino	2017-11-28	4	-21/+5
\|\ \ \| \| \| \| \| \|	Remove dns_port fact
\| * \|	Remove dns_port fact	Michael Gugino	2017-11-28	4	-21/+5
\|/ / \| \| \| \| \| \|	Simply dns_port variable by remove from openshift_facts.
* \|	Merge pull request #6295 from mtnbikenc/remove-etcd-file	Russell Teague	2017-11-28	1	-8/+0
\|\ \ \| \| \| \| \| \|	Remove unused task file from etcd role
\| * \|	Remove unused task file from etcd role	Russell Teague	2017-11-28	1	-8/+0
\| \| \|
* \| \|	Merge pull request #6269 from mgugino-upstream-stage/clock-depends	Michael Gugino	2017-11-28	6	-3/+4
\|\ \ \ \| \| \| \| \| \| \| \|	Remove openshift_clock from meta depends
\| * \| \|	Remove openshift_clock from meta depends	Michael Gugino	2017-11-27	6	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds openshift_clock role to required plays instead of using meta_depends.
* \| \| \|	Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-node	Michael Gugino	2017-11-28	17	-124/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Combine openshift_node and openshift_node_dnsmasq
\| * \| \| \|	Combine openshift_node and openshift_node_dnsmasq	Michael Gugino	2017-11-27	17	-124/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit combines these two roles. This will prevent openshift_node_facts from running twice.
* \| \| \| \|	Merge pull request #6283 from mgugino-upstream-stage/schedulable	Michael Gugino	2017-11-28	5	-21/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove schedulable from openshift_facts
\| * \| \| \| \|	remove schedulable from openshift_facts	Michael Gugino	2017-11-27	5	-21/+8
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit removes schedulable from openshift_facts in favor of detecting whether or not a host is a master via inventory.
* \| \| \| \|	Merge pull request #6259 from adelton/issue-6255	Michael Gugino	2017-11-28	32	-43/+43
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	dist.iteritems() no longer exists in Python 3.
\| * \| \| \|	dist.iteritems() no longer exists in Python 3.	Jan Pazdziora	2017-11-27	32	-43/+43
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6280 from mgugino-upstream-stage/cli_image	Scott Dodson	2017-11-28	6	-12/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove openshift.common.cli_image
\| * \| \| \| \|	Remove openshift.common.cli_image	Michael Gugino	2017-11-27	6	-12/+13
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit removes openshift.common.cli_image in favor of openshift_cli_image.
* \| \| \| \|	Merge pull request #6287 from zgalor/prom-version-update	Scott Dodson	2017-11-28	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update prometheus to 2.0.0 GA
\| * \| \| \| \|	Update prometheus to 2.0.0 GA	Zohar Galor	2017-11-28	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6291 from ingvagabund/fix-type	Scott Dodson	2017-11-28	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	fix type in authroize
\| * \| \| \| \|	fix type in authroize	Jan Chaloupka	2017-11-28	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #6284 from ashcrow/add-svc-catalog-inventory-doc	Scott Dodson	2017-11-27	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	inventory: Add example for service catalog vars
\| * \| \| \| \|	inventory: Add example for service catalog vars	Steve Milner	2017-11-27	1	-0/+8
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Steve Milner <smilner@redhat.com>
* \| \| \| \|	Merge pull request #6272 from abutcher/fix-env-facts	Scott Dodson	2017-11-27	1	-6/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix openshift_env fact creation within openshift_facts.
\| * \| \| \| \|	Fix openshift_env fact creation within openshift_facts.	Andrew Butcher	2017-11-27	1	-6/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6240 from ↵	Russell Teague	2017-11-27	6	-12/+12
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mtnbikenc/include-deprecation-openshift-service-catalog Include Deprecation - openshift-service-catalog
\| * \| \| \| \|	Include Deprecation - openshift-service-catalog	Russell Teague	2017-11-22	6	-12/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6271 from jarrpa/glusterblock-fix	Scott Dodson	2017-11-27	2	-2/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	GlusterFS: Remove extraneous line from glusterblock template
\| * \| \| \| \|	GlusterFS: Remove extraneous line from glusterblock template	Jose A. Rivera	2017-11-27	2	-2/+0
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* \| \| \| \|	Merge pull request #6199 from mgugino-upstream-stage/master_sys_container	Michael Gugino	2017-11-27	4	-7/+7
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Simplify is_master_system_container logic
\| * \| \| \|	Simplify is_master_system_container logic	Michael Gugino	2017-11-27	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify the variable is_master_system_container
* \| \| \| \|	Merge pull request #6143 from dabelenda/add_hostname_routes	Michael Gugino	2017-11-27	3	-0/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow to set the hostname for routes to prometheus and alertmanager
\| * \| \| \| \|	Remove spurrious file committed by error	Diego Abelenda	2017-11-24	1	-15/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fix name of the service pointed to by hostname	Diego Abelenda	2017-11-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Missed the default value after the variable name change...	Diego Abelenda	2017-11-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Change the name of the variable and explicitely document the names	Diego Abelenda	2017-11-24	3	-2/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Allow to set the hostname for routes to prometheus and alertmanager	Diego Abelenda	2017-11-24	3	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #6185 from ↵	Michael Gugino	2017-11-27	1	-6/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	giuseppe/fix-additional-and-insecure-registries-for-crio cri-o: honor additional and insecure registries again
\| * \| \| \| \| \|	cri-o: honor additional and insecure registries again	Giuseppe Scrivano	2017-11-20	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regression introduced with: https://github.com/openshift/openshift-ansible/commit/ee6adf9e9a520cc5873bf9f36924ae9aa4c47c7c Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* \| \| \| \| \| \|	Merge pull request #6178 from giuseppe/copy-docker-to-alt-storage-path	Michael Gugino	2017-11-27	1	-4/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	docker: copy Docker metadata to the alternative storage path
\| * \| \| \| \| \|	docker: copy Docker metadata to the alternative storage path	Giuseppe Scrivano	2017-11-20	1	-4/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* \| \| \| \| \|	Merge pull request #6198 from mgugino-upstream-stage/openvswitch-sys-container	Michael Gugino	2017-11-27	3	-4/+3
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Remove is_openvswitch_system_container from facts
\| * \| \| \| \|	Remove is_openvswitch_system_container from facts	Michael Gugino	2017-11-22	3	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply logic for this variable.
* \| \| \| \| \|	Merge pull request #6134 from fraenkel/allow_false	Scott Dodson	2017-11-24	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow openshift_install_examples to be false